pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

添加出库时输入数量功能

lwx_dev
erdanergou 3 years ago
parent
c0840d2d28
commit
e70eb7e90b
16 changed files with 228 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 1
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  3. 5
      src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
  4. 15
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  5. 7
      src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java
  6. 1
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
  7. 25
      src/main/resources/templates/pages/application/application-in.html
  8. 7
      src/main/resources/templates/pages/application/application-out.html
  9. 3
      src/main/resources/templates/pages/application/application-out_min-mobile.html
  10. 7
      src/main/resources/templates/pages/application/application-transfer.html
  11. 46
      src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
  12. 25
      target/classes/templates/pages/application/application-in.html
  13. 7
      target/classes/templates/pages/application/application-out.html
  14. 3
      target/classes/templates/pages/application/application-out_min-mobile.html
  15. 7
      target/classes/templates/pages/application/application-transfer.html
  16. 46
      target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

16
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
View File

@ -501,6 +501,18 @@ public class DepositoryRecordController {
SimpleApplicationOutMinRecordP simpleApplicationOutMinRecordP = new SimpleApplicationOutMinRecordP(applicationOutMinById);
// 获取申请的物料信息
Material materialById = materialService.findMaterialById(applicationOutMinById.getMid());
// 获取当前物料所存在的库位
List<PlaceP> placeByMidAndDid = placeService.findPlaceByMidAndDid(materialById.getId(), applicationOutMinById.getDepositoryId());
// 获取库位编码
StringBuffer sb = new StringBuffer();
for (int j = 0; j < placeByMidAndDid.size(); j++) {
PlaceP placeP = placeByMidAndDid.get(j);
String code = placeP.getCode();
if("0000".equals(code)){
code = "默认库位";
}
sb.append(code).append(",");
}
// 获取当前出库库位
Place placeByDid = placeService.findPlaceById(applicationOutMinById.getPlaceId());
// 获取当前子订单处理人编号
@ -510,6 +522,7 @@ public class DepositoryRecordController {
// 获取处理人
UserByPort checker = LinkInterfaceUtil.FindUserById(checkId,userToken);
simpleApplicationOutMinRecordP.setCheckerName(checker.getName());
simpleApplicationOutMinRecordP.setPcode(placeByDid.getCode());
}
List<MaterialAndProducedDate> materialAndProducedDateByMid = materialService.findMaterialAndProducedDateByMid(materialById.getId());
if (materialAndProducedDateByMid.size() > 0) {
@ -523,7 +536,6 @@ public class DepositoryRecordController {
}
}
}
simpleApplicationOutMinRecordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(applicationOutRecordPById.getApplicantTime())));
simpleApplicationOutMinRecordP.setApplyRemark(applicationOutRecordPById.getApplyRemark());
simpleApplicationOutMinRecordP.setDepositoryId(depositoryRecordById.getId());
@ -532,7 +544,7 @@ public class DepositoryRecordController {
simpleApplicationOutMinRecordP.setMcode(materialById.getCode());
simpleApplicationOutMinRecordP.setApplicantName(userByPort.getName());
simpleApplicationOutMinRecordP.setCode(applicationOutRecordPById.getCode());
simpleApplicationOutMinRecordP.setPcode(placeByDid.getCode());
simpleApplicationOutMinRecordP.setPcode(sb.toString());
simpleApplicationOutMinRecordP.setPid(placeByDid.getId());
simpleApplicationOutMinRecordP.setState(state);

1
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -1435,7 +1435,6 @@ public class MaterialController {
PidOrDidAndCode locationByQrCode = placeService.findLocationByQrCode(qrCode);
if (locationByQrCode != null) {
// 如果不为空，则是库位码
// 1为库位2为仓库
Integer locationFlag = locationByQrCode.getFlag();
if (Integer.compare(locationFlag, 1) == 0) {

5
src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java
View File

@ -54,4 +54,9 @@ public class ApplicationOutRecordMin {
*/
private Integer transferId;
/**
* 已经出库的数量
*/
private Integer trueOut;
}

15
src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
View File

@ -142,7 +142,7 @@
</sql>
<sql id="ApplicationOutRecordMinInfo">
aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId
aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut
</sql>
<!-- 查询所有数据行数 -->
<select id="findCount" resultType="integer">
@ -667,7 +667,7 @@
<!-- 插入一条出库子订单-->
<insert id="insertApplicationOutRecordMin" parameterType="map" useGeneratedKeys="true" keyProperty="id">
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId)
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut)
values(
#{id},
#{mid},
@ -677,7 +677,8 @@
#{placeId},
#{checkId},
#{parentId},
#{transferId}
#{transferId},
#{trueOut}
)
</insert>
@ -734,6 +735,9 @@
<if test="parentId != null">
and aorm.parentId = #{parentId}
</if>
<if test="trueOut != null">
and arom.trueOut = #{trueOut}
</if>
</select>
@ -918,7 +922,10 @@
checkId = #{checkId},
</if>
<if test="parentId != null ">
parentId = #{parentId}
parentId = #{parentId},
</if>
<if test="trueOut != null">
trueOut = #{trueOut}
</if>
where id = #{id}

7
src/main/java/com/dreamchaser/depository_manage/pojo/SimpleApplicationOutMinRecordP.java
View File

@ -76,9 +76,16 @@ public class SimpleApplicationOutMinRecordP {
*/
private String producedDate;
/**
* 已经出库的数量
*/
private Integer trueOut;
public SimpleApplicationOutMinRecordP(ApplicationOutRecordMin applicationOutRecordMin) {
this.id = applicationOutRecordMin.getId();
this.parentId = applicationOutRecordMin.getParentId();
this.quantity = applicationOutRecordMin.getQuantity();
this.trueOut = applicationOutRecordMin.getTrueOut();
}
}

1
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
View File

@ -669,6 +669,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
Material materialById = materialMapper.findMaterialById(mid);
map.put("depositoryId", materialById.getDepositoryId());
map.put("trueOut",0);
return depositoryRecordMapper.insertApplicationOutRecordMin(map);
}

25
src/main/resources/templates/pages/application/application-in.html
View File

@ -717,7 +717,6 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
var data = d.data;
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var codeChildren = parent.childNodes[7];
var priceChildren = parent.childNodes[13];
@ -804,11 +803,17 @@
var data = d.data;
var material = data["material"];
var parent = obj.parentNode.parentNode.parentNode.parentNode;
// 条形码
var barCodeChildren = parent.childNodes[9];
var barCodeItem = barCodeChildren.childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
if (material !== null) {
// 如果发现对应关系
var codeChildren = parent.childNodes[7];
var priceChildren = parent.childNodes[13];
var materialChildren = parent.childNodes[5];
// 条形码
var barCodeChildren = parent.childNodes[9];
var codeItem = codeChildren.childNodes[3].childNodes[1];
var codeValue = codeItem.childNodes[1];
var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
@ -819,8 +824,6 @@
var priceItem = priceChildren.childNodes[3].childNodes;
var priceValue = priceItem[1];
// 条形码条码
var barCodeItem = barCodeChildren.childNodes[3];
var code = material.mcode;
if (code === undefined) {
code = "";
@ -829,19 +832,25 @@
materialId.value = material.mid;
codeValue.value = code;
priceValue.value = material.price;
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCodeInput.value = result;
var idNumber = materialId.name.split("mid")[1];
var shelfLife = material.shelfLife;
if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show();
$("#" + "producedDate" + idNumber).attr("lay-verify", "required");
}
else{
} else {
$("#" + "producedDateItem" + idNumber).hide();
form.render();
}
form.render();
} else {
// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
}
})

7
src/main/resources/templates/pages/application/application-out.html
View File

@ -695,6 +695,13 @@
materialCode.value = data.mcode;
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCodeInput.value = result;
}else{
// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
}

3
src/main/resources/templates/pages/application/application-out_min-mobile.html
View File

@ -59,6 +59,7 @@
var data = d.data;
if(state === "0") {
for (let i = 0; i < data.length; i++) {
console.log(data[i]);
let producedDate = data[i].producedDate === null?"":data[i].producedDate;
// 头部信息
lis.push('<li style="width:100%;">' +
@ -72,6 +73,7 @@
'<h4> 物料编码：' + data[i].mcode + '</h4>' +
'<h4> 出库数量：' + data[i].quantity + '</h4>' +
'<h4> 生产日期：' + producedDate + '</h4>' +
'<h4> 所处库位：' + data[i].pcode + '</h4>' +
'<div>备注：<h4> ' + data[i].applyRemark + '</h4></div>' +
'</div>');
// 底部信息
@ -93,6 +95,7 @@
'<h4> 出库数量：' + data[i].quantity + '</h4>' +
'<h4> 处理人：' + data[i].checkerName + '</h4>' +
'<h4> 生产日期：' + producedDate+ '</h4>' +
'<h4> 所处库位：' + data[i].pcode + '</h4>' +
'<div>备注：<h4> ' + data[i].applyRemark + '</h4></div>' +
'</div>');
// 底部信息

7
src/main/resources/templates/pages/application/application-transfer.html
View File

@ -435,7 +435,12 @@
$('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
}
}// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
});

46
src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
View File

@ -37,6 +37,9 @@
// 先定义，用于弹出确定框
function isOutTrue() {
}
function outQuantityCheck() {
}
// 用于判断是否包含字母
@ -74,8 +77,8 @@
isOutTrue = function (req) {
var confirmIndex = layer.confirm("确定出库？", {
btn: ["确定", "取消"]
}, function () { // 如果确定出库
},
function () { // 如果确定出库
layui.$.ajax({
url: "/depositoryRecord/isCheckOut",
type: "post",
@ -98,7 +101,6 @@
});
} else {
// 如果出库失败
layer.msg(res.statusInfo.detail + ",请重试");
depository = null;
material = null;
@ -110,7 +112,8 @@
}
})
}, function () {
},
function () {
// 如果取消
depository = null;
material = null;
@ -118,7 +121,8 @@
layer.close(layer.index);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}
)
};
// 具体出库逻辑
@ -160,7 +164,6 @@
// 如果是物料
material = data.material;
if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) {
layer.confirm("出库物料不正确，请重新扫描", {
btn: ["确定","取消"]
}, function(){
@ -184,7 +187,6 @@
parent.layer.close(index);
})
// 继续扫描
}
else {
if (depository !== null) { // 如果已经扫描仓库
@ -205,7 +207,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
else if (place != null) {
@ -239,7 +241,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
else {
@ -332,7 +334,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
@ -388,7 +390,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
@ -396,8 +398,30 @@
}
})
};
outQuantityCheck = function (req) {
layer.prompt({
formType: 0,
value: quantity,
title: '请输入出库数量',
}, function(value, index, elem){
if(value > quantity){
layer.msg("非法值，重新输入！",{
icon: 0,
time: 500
},
function () {
outQuantityCheck(req);
})
}else{
req.quantity = value;
layer.close(index);
isOutTrue(req);
}
});
}
</script>

25
target/classes/templates/pages/application/application-in.html
View File

@ -717,7 +717,6 @@
contentType: "application/json;charset=utf-8",
success: function (d) {
var data = d.data;
var parent = obj.parentNode.parentNode.parentNode.parentNode;
var codeChildren = parent.childNodes[7];
var priceChildren = parent.childNodes[13];
@ -804,11 +803,17 @@
var data = d.data;
var material = data["material"];
var parent = obj.parentNode.parentNode.parentNode.parentNode;
// 条形码
var barCodeChildren = parent.childNodes[9];
var barCodeItem = barCodeChildren.childNodes[3];
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
if (material !== null) {
// 如果发现对应关系
var codeChildren = parent.childNodes[7];
var priceChildren = parent.childNodes[13];
var materialChildren = parent.childNodes[5];
// 条形码
var barCodeChildren = parent.childNodes[9];
var codeItem = codeChildren.childNodes[3].childNodes[1];
var codeValue = codeItem.childNodes[1];
var materialItem = materialChildren.childNodes[3].childNodes[1].childNodes;
@ -819,8 +824,6 @@
var priceItem = priceChildren.childNodes[3].childNodes;
var priceValue = priceItem[1];
// 条形码条码
var barCodeItem = barCodeChildren.childNodes[3];
var code = material.mcode;
if (code === undefined) {
code = "";
@ -829,19 +832,25 @@
materialId.value = material.mid;
codeValue.value = code;
priceValue.value = material.price;
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCodeInput.value = result;
var idNumber = materialId.name.split("mid")[1];
var shelfLife = material.shelfLife;
if (shelfLife !== null && shelfLife !== undefined) {
$("#" + "producedDateItem" + idNumber).show();
$("#" + "producedDate" + idNumber).attr("lay-verify", "required");
}
else{
} else {
$("#" + "producedDateItem" + idNumber).hide();
form.render();
}
form.render();
} else {
// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
}
})

7
target/classes/templates/pages/application/application-out.html
View File

@ -695,6 +695,13 @@
materialCode.value = data.mcode;
var barCodeInput = barCodeItem.childNodes[1].childNodes[1];
barCodeInput.value = result;
}else{
// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
}

3
target/classes/templates/pages/application/application-out_min-mobile.html
View File

@ -59,6 +59,7 @@
var data = d.data;
if(state === "0") {
for (let i = 0; i < data.length; i++) {
console.log(data[i]);
let producedDate = data[i].producedDate === null?"":data[i].producedDate;
// 头部信息
lis.push('<li style="width:100%;">' +
@ -72,6 +73,7 @@
'<h4> 物料编码：' + data[i].mcode + '</h4>' +
'<h4> 出库数量：' + data[i].quantity + '</h4>' +
'<h4> 生产日期：' + producedDate + '</h4>' +
'<h4> 所处库位：' + data[i].pcode + '</h4>' +
'<div>备注：<h4> ' + data[i].applyRemark + '</h4></div>' +
'</div>');
// 底部信息
@ -93,6 +95,7 @@
'<h4> 出库数量：' + data[i].quantity + '</h4>' +
'<h4> 处理人：' + data[i].checkerName + '</h4>' +
'<h4> 生产日期：' + producedDate+ '</h4>' +
'<h4> 所处库位：' + data[i].pcode + '</h4>' +
'<div>备注：<h4> ' + data[i].applyRemark + '</h4></div>' +
'</div>');
// 底部信息

7
target/classes/templates/pages/application/application-transfer.html
View File

@ -435,7 +435,12 @@
$('#place' + codeId).append(new Option(item.depositoryName + "-" + item.code, item.id));//往下拉菜单里添加元素
});
form.render();
}
}// 如果没有对应关系
layer.msg("对于编码：" + result + ",并未发现对应的物料", {
icon: 0,
time: 1000 //0.5秒关闭（如果不配置，默认是3秒）
}, function () {
})
}
});

46
target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
View File

@ -37,6 +37,9 @@
// 先定义，用于弹出确定框
function isOutTrue() {
}
function outQuantityCheck() {
}
// 用于判断是否包含字母
@ -74,8 +77,8 @@
isOutTrue = function (req) {
var confirmIndex = layer.confirm("确定出库？", {
btn: ["确定", "取消"]
}, function () { // 如果确定出库
},
function () { // 如果确定出库
layui.$.ajax({
url: "/depositoryRecord/isCheckOut",
type: "post",
@ -98,7 +101,6 @@
});
} else {
// 如果出库失败
layer.msg(res.statusInfo.detail + ",请重试");
depository = null;
material = null;
@ -110,7 +112,8 @@
}
})
}, function () {
},
function () {
// 如果取消
depository = null;
material = null;
@ -118,7 +121,8 @@
layer.close(layer.index);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}
)
};
// 具体出库逻辑
@ -160,7 +164,6 @@
// 如果是物料
material = data.material;
if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) {
layer.confirm("出库物料不正确，请重新扫描", {
btn: ["确定","取消"]
}, function(){
@ -184,7 +187,6 @@
parent.layer.close(index);
})
// 继续扫描
}
else {
if (depository !== null) { // 如果已经扫描仓库
@ -205,7 +207,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
else if (place != null) {
@ -239,7 +241,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
else {
@ -332,7 +334,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
@ -388,7 +390,7 @@
param.qrCode = qrCode;
param.barCode = barCode;
// 弹出确定框
isOutTrue(param);
outQuantityCheck(param);
}
}
@ -396,8 +398,30 @@
}
})
};
outQuantityCheck = function (req) {
layer.prompt({
formType: 0,
value: quantity,
title: '请输入出库数量',
}, function(value, index, elem){
if(value > quantity){
layer.msg("非法值，重新输入！",{
icon: 0,
time: 500
},
function () {
outQuantityCheck(req);
})
}else{
req.quantity = value;
layer.close(index);
isOutTrue(req);
}
});
}
</script>

Write Preview
Loading…
Cancel
Save