diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index e6ff755..89b6f01 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -251,6 +251,9 @@ public class RkInfo extends BaseEntity @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endDate; + /** 场景 */ + @Excel(name = "场景") + private String scene; public void setId(Long id) { this.id = id; @@ -796,6 +799,15 @@ public class RkInfo extends BaseEntity this.endDate = endDate; } + public void setScene(String scene) + { + this.scene = scene; + } + + public String getScene() + { + return scene; + } @Override public String toString() { @@ -861,6 +873,7 @@ public class RkInfo extends BaseEntity .append("startDate", startDate) .append("endDate", endDate) .append("totalAmount", totalAmount) + .append("scene", getScene()) .toString(); } } diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java index 22a5688..5b74d90 100644 --- a/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java +++ b/src/main/java/com/zg/project/wisdom/service/impl/RkBillServiceImpl.java @@ -133,7 +133,7 @@ public class RkBillServiceImpl implements IRkBillService for (RkInfo info : rkInfoList) { info.setExecStatus(bill.getExecStatus()); - + String scene = ""; // 库位校验 if (StringUtils.isNotBlank(info.getPcode())) { PcdeDetail pcde = pcdeDetailMapper.selectByPcodeAndWarehouse( @@ -144,6 +144,9 @@ public class RkBillServiceImpl implements IRkBillService throw new RuntimeException("库位不存在:" + info.getPcode()); } info.setPcodeId(pcde.getEncodedId()); + if(StringUtils.isNotBlank(pcde.getScene())){ + scene = pcde.getScene(); + } } // rk_info @@ -159,7 +162,7 @@ public class RkBillServiceImpl implements IRkBillService info.setHasMoved("0"); info.setIsBorrowed("0"); info.setIsDelete("0"); - + info.setScene(scene); info.setCreateTime(now); info.setCreateBy(userId); diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 2949658..fd13c23 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -66,6 +66,7 @@ + @@ -298,7 +299,7 @@ is_delivery, fycde_1, fycde_2, is_update, - create_by, create_time, is_delete + create_by, create_time, is_delete,scene ) VALUES ( #{operationType}, #{bizType}, #{wlType}, #{cangku}, #{operationTime}, #{operator}, @@ -316,7 +317,7 @@ #{isDelivery}, #{fycde1}, #{fycde2}, #{isUpdate}, - #{createBy}, #{createTime}, #{isDelete} + #{createBy}, #{createTime}, #{isDelete},#{scene} )