diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 11cb7978..dd371467 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1595,7 +1595,7 @@ public class DepositoryController { } try { // 二维码保存信息 - return RestResponse.CreateQrCode(qrCode); + return RestResponse.CreateBarCode(qrCode); } catch (IOException e) { return new RestResponse("err: " + e.getMessage(), 678, new StatusInfo("失败", "请联系开发人员")); } diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java index 70b7abd5..17265bff 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/RestResponse.java @@ -13,6 +13,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; +import java.util.HashMap; import java.util.Map; /** @@ -75,7 +76,26 @@ public class RestResponse implements Serializable { public static RestResponse CreateQrCode(String context) throws IOException { // 生成base64类型图片 String qrCode = CreateQrCodeUtil.createQrCode(context, 200, 200); - return new RestResponse(qrCode,200,new StatusInfo("成功！","二维码生成成功")); + Map result = new HashMap<>(); + result.put("qrCode",qrCode); + result.put("codeValue",context); + return new RestResponse(result,200,new StatusInfo("成功！","二维码生成成功")); + } + + + /** + * 生成条形码 + * @param context 随机数 + * @return + * @throws IOException + */ + public static RestResponse CreateBarCode(String context) throws IOException { + // 生成base64类型图片 + String qrCode = CreateQrCodeUtil.CreateBarCode128(context, 50, 200); + Map result = new HashMap<>(); + result.put("qrCode",qrCode); + result.put("codeValue",context); + return new RestResponse(result,200,new StatusInfo("成功！","条形码生成成功")); } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index c6882fe6..bbf888ce 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -1917,7 +1917,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将当前redis中存储的spno删除 redisTemplate.delete(spNo); } - } else { + } + else { // 如果是部门负责人 String departmentheadTime = recordP.getDepartmentheadTime(); @@ -1959,7 +1960,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if (flag) { return 1; } - map.put("id", outId); return depositoryRecordMapper.updateApplicationOutRecord(map); @@ -2168,6 +2168,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { }).start(); + } else { // 如果没有通过 updateInventoryForOutRefused(record); @@ -2210,7 +2211,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { qyWxOperationService.sendMessageForOtherUserByCard(ObjectFormatUtil.toInteger(id), s, userAgent, 1); } }).start(); - } else { + } + else { String result = ""; // 开启线程更改其他用户卡片模板样式 String simpleTime = DateUtil.getSimpleTime(new Date()); @@ -2225,6 +2227,12 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { if(depositoryManagerPass == null){ depositoryManagerPass = (Integer) map.get("departmentheadPass"); } + String departmentheadTime = record.getDepartmentheadTime(); + // 用于标识部门负责人是否审批 + boolean flagFordepartmentTime = false; // 默认审批过 + if("0".equals(departmentheadTime)){ + flagFordepartmentTime = true; + } if (depositoryManagerPass == 1) { // 如果审核通过 result = "通过"; @@ -2309,6 +2317,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { }).start(); } + + /*for (int i = 0; i < depositoryIdList.size(); i++) { Object o = minIdByDepository.get("depository" + depositoryIdList.get(i)); if (o != null) { @@ -2362,22 +2372,23 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 将主订单插入到redis中 redisTemplate.opsForHash().put("record:" + record.getId(), "minRecord", minRecordByMain.toString()); map.put("state", "仓储中心负责人审核通过"); - if (!flagForHasOtherDepository) { + + if (flagFordepartmentTime) { map.put("state", "部门负责人审核通过"); - map.put("departmenthead", userid); - map.put("departmentheadPass", 1); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("depositoryManagerPass", 4); - + map.put("departmenthead", userToken.getId()); + map.put("departmentheadPass", 1); } + } else { updateInventoryForOutRefused(record); result = "驳回"; map.put("pass", 2); map.put("state", "仓储中心负责人审核未通过"); - if (!flagForHasOtherDepository) { + if (flagFordepartmentTime) { map.put("state", "部门负责人审核未通过"); - map.put("departmenthead", userid); + map.put("departmenthead", userToken.getId()); map.put("departmentheadPass", 2); map.put("departmentheadTime", DateUtil.DateTimeToTimeStamp(simpleTime)); map.put("depositoryManagerPass", 4); diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index 20347211..7be9cafb 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -128,32 +128,6 @@ var $ = layui.$, form = layui.form, step = layui.step; - /* - var state=$("#state").text(); - var pass=$("#pass").text(); - //当前处于的状态 - var position=0,states={},number = 1; - - if (state === "待部门负责人审核" || state === "部门负责人审核未通过") { - states = [ {title: state}]; - number = 2; - } else { - if(state === "待仓储中心负责人审核"|| state === "仓储中心负责人审核未通过"){ - states = [ {title: state}]; - number = 3; - }else{ - if(pass === 1 || pass === "1"){ - number = 4; - states = [{title:"已出库"}] - }else if(pass === 3 || pass === "3"){ - number = 4; - states = [{title:"出库中"}] - }else if(pass === 2 || pass === "2"){ - number = 4; - states = [{title:"未出库"}] - } - } - }*/ step.render({ elem: '#stepForm', filter: 'stepForm', @@ -168,12 +142,10 @@ let departmentheadTime=$("#departmentheadTime").text(); let depositoryManagerNameTime=$("#depositoryManagerNameTime").text(); let depositoryManagerPass = $("#depositoryManagerPass").val(); + if (departmentheadTime!=null&&departmentheadTime!==""){ $("#departmentheadTimeT").show(); $("#departmentheadMessageT").show(); - if (state!=="审核未通过"){ - $("#departmentheadMessageT").show(); - } } if (depositoryManagerNameTime!=null&&depositoryManagerNameTime!=="" && depositoryManagerPass !== "4"){ diff --git a/src/main/resources/templates/pages/group/group_edit.html b/src/main/resources/templates/pages/group/group_edit.html index 870e8124..1b2b7fad 100644 --- a/src/main/resources/templates/pages/group/group_edit.html +++ b/src/main/resources/templates/pages/group/group_edit.html @@ -351,7 +351,7 @@ success: function (d) { var data = d.data; layer.close(this.layerIndex); - $("#qrCode").attr("src",data); + // $("#qrCode").attr("src",data.qrCode); $("#qrCode").show(); $("#createCode").hide(); } diff --git a/src/main/resources/templates/pages/material/material-out_back.html b/src/main/resources/templates/pages/material/material-out_back.html index 8d29d915..717e0640 100644 --- a/src/main/resources/templates/pages/material/material-out_back.html +++ b/src/main/resources/templates/pages/material/material-out_back.html @@ -315,7 +315,7 @@ if (data.status != 200) { layer.msg(data.statusInfo.messgae) } else { - $("#qrCode").attr("src", data.data); + $("#qrCode").attr("src", data.data.qrCode); } } }) diff --git a/src/main/resources/templates/pages/warehouse/warehouse_view.html b/src/main/resources/templates/pages/warehouse/warehouse_view.html index 3f73939f..050174d7 100644 --- a/src/main/resources/templates/pages/warehouse/warehouse_view.html +++ b/src/main/resources/templates/pages/warehouse/warehouse_view.html @@ -86,7 +86,9 @@
@@ -139,7 +141,7 @@ //提交 form.on('submit(formDemo)', function(data){ - data = data.field + data = data.field; $.ajax({ url: "/repository/depository_edit", type: 'post', @@ -165,7 +167,7 @@ }) } } - }) + }); return false; }); @@ -185,7 +187,8 @@ success: function (d) { var data = d.data; layer.close(this.layerIndex); - //$("#qrCode").attr("src", data); + // $("#barCode").attr("src", data.qrCode); + $("#barCodeValue").text(data.codeValue); $("#codeItem").show(); $("#createCode").hide(); }