wms / wms4_zhongputaicang · Commits

Commit 766295257bc294b3edc947114741c0ab476f7be1

Authored by 谭毅彬
2 parents cce7b156 3e91e399

Merge branch 'develop' of http://git.huahengcloud.com/wms/wms4.git into develop

Inline Side-by-side
Showing 4 changed files with 15 additions and 8 deletions
ant-design-vue-jeecg/src/views/system/flow/FlowProcess.vue
  View file @7662952
... ... @@ -9,7 +9,7 @@
9 9 cancelText="关闭">
10 10 <a-card :bordered="false">
11 11 <div>
12   - <div style="font-size: 16px; color: rgba(0, 0, 0, 0.85); font-weight: 500; margin-bottom: 20px;">订单编号:{{flowInfo.code}}</div>
  12 + <div style="font-size: 16px; color: rgba(0, 0, 0, 0.85); font-weight: 500; margin-bottom: 20px;">订单编号:{{flowInfo.shipmentCode}}</div>
13 13 <a-row style="margin-bottom: 16px">
14 14 <a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
15 15 <span style="color: rgba(0, 0, 0, 0.85)">创建人：{{flowInfo.createBy}}</span>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/entity/AuditFlow.java
  View file @7662952
... ... @@ -28,7 +28,9 @@ public class AuditFlow implements Serializable {
28 28 private static final long serialVersionUID = 1L;
29 29  
30 30 //单号
31   - private String code;
  31 + private String shipmentCode;
  32 + //返回值
  33 + private Integer code;
32 34 //单据类型
33 35 private String type;
34 36 //创建人
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/service/impl/AuditServiceImpl.java
  View file @7662952
... ... @@ -112,10 +112,10 @@ public class AuditServiceImpl extends ServiceImpl&lt;AuditMapper, Audit&gt; implements
112 112 @Override
113 113 public Result<Audit> auditShipment(Audit audit) {
114 114 //根据出库单id,用户名称,找到审核数据
115   - LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
116   - lambdaQueryWrapper.eq(Audit::getReceiptId,audit.getShipmentId())
117   - .eq(Audit::getAuditorid,audit.getAuditorid()).last("limit 1");
118   - Audit audit1=this.getOne(lambdaQueryWrapper);
  115 + LambdaQueryWrapper<Audit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
  116 + lambdaQueryWrapper.eq(Audit::getShipmentId, audit.getShipmentId()).eq(Audit::getAuditorid, audit.getAuditorid())
  117 + .eq(Audit::getStatus, QuantityConstant.AUDIT_STAY_STATUS).orderByAsc(Audit::getSequence).last("limit 1");
  118 + Audit audit1 = this.getOne(lambdaQueryWrapper);
119 119 if (StringUtils.isNotNull(audit1)){
120 120 audit1.setStatus(audit.getStatus());
121 121 audit1.setRemark(audit.getRemark());
... ... @@ -320,14 +320,16 @@ public class AuditServiceImpl extends ServiceImpl&lt;AuditMapper, Audit&gt; implements
320 320 //查询单据信息
321 321 if (StringUtils.isNotEmpty(audit.getReceiptId())){
322 322 ReceiptHeader receiptHeader=receiptHeaderService.getById(audit.getReceiptId());
323   - auditFlow.setCode(receiptHeader.getCode());
  323 + auditFlow.setCode(QuantityConstant.HTTP_OK);
  324 + auditFlow.setShipmentCode(receiptHeader.getCode());
324 325 auditFlow.setCreateBy(receiptHeader.getCreateBy());
325 326 auditFlow.setCreateTime(receiptHeader.getCreateTime());
326 327 auditFlow.setType(receiptHeader.getType());
327 328 }
328 329 if (StringUtils.isNotEmpty(audit.getShipmentId())){
329 330 ShipmentHeader shipmentHeader=shipmentHeaderService.getById(audit.getShipmentId());
330   - auditFlow.setCode(shipmentHeader.getCode());
  331 + auditFlow.setCode(QuantityConstant.HTTP_OK);
  332 + auditFlow.setShipmentCode(shipmentHeader.getCode());
331 333 auditFlow.setCreateBy(shipmentHeader.getCreateBy());
332 334 auditFlow.setCreateTime(shipmentHeader.getCreateTime());
333 335 auditFlow.setType(shipmentHeader.getType());
... ...
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
  View file @7662952
... ... @@ -391,6 +391,9 @@ public class QuantityConstant {
391 391 // 出库单审核流程
392 392 public static final Integer SHIPMENT_AUDIT = 2;
393 393  
  394 + // 待审核
  395 + public static final Integer AUDIT_STAY_STATUS = 0;
  396 +
394 397 // 审核通过
395 398 public static final Integer AUDIT_YES_STATUS = 1;
396 399 // 审核驳回
... ...