root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：入库类型判断

Browse Source
This commit is contained in:
liuxy
2024-07-27 14:42:00 +08:00
parent ea62fbeb6a
commit c9bda79981
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm_manage/enums/SUBEnum.java
View File

@@ -19,6 +19,9 @@ import java.util.Map;
public enum SUBEnum { public enum SUBEnum {
// 子卷包装状态 // 子卷包装状态
STATUS(MapOf.of("生成", "0", "包装", "1", "入库", "2", "出库", "3")), STATUS(MapOf.of("生成", "0", "包装", "1", "入库", "2", "出库", "3")),
// 子卷包装类型
SUB_TYPE(MapOf.of("返检入库", "1", "改切入库", "2")),
; ;
private Map<String, String> code; private Map<String, String> code;

14
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.extern.log4j.Log4j; import lombok.extern.log4j.Log4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.nl.b_lms.pdm_manage.enums.SUBEnum;
import org.nl.b_lms.sch.task.dao.SchBaseTask; import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.service.IschBaseTaskService; import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
@@ -245,7 +246,18 @@ public class InBussManageServiceImpl implements InBussManageService {
mst.put("bill_status", IOSEnum.BILL_STATUS.code("生成")); mst.put("bill_status", IOSEnum.BILL_STATUS.code("生成"));
mst.put("total_qty", subList.stream().map(row -> row.getDoubleValue("net_weight")).reduce(Double::sum).orElse(0.00)); mst.put("total_qty", subList.stream().map(row -> row.getDoubleValue("net_weight")).reduce(Double::sum).orElse(0.00));
mst.put("detail_count", subList.size()); mst.put("detail_count", subList.size());
mst.put("bill_type", jsonObject.getString("bill_type")); // 根据子卷类型判断是返检入库还是反切入库
if (ObjectUtil.isEmpty(subList.get(0).getString("sub_type"))) {
mst.put("bill_type", jsonObject.getString("bill_type"));
} else {
if (subList.get(0).getString("sub_type").equals(SUBEnum.SUB_TYPE.code("返检入库"))) {
mst.put("bill_type", IOSEnum.IN_TYPE.code("返检入库"));
} else if (subList.get(0).getString("sub_type").equals(SUBEnum.SUB_TYPE.code("改切入库"))) {
mst.put("bill_type", IOSEnum.IN_TYPE.code("改切入库"));
} else {
mst.put("bill_type", jsonObject.getString("bill_type"));
}
}
mst.put("biz_date", DateUtil.today()); mst.put("biz_date", DateUtil.today());
mst.put("remark", ""); mst.put("remark", "");
// 明细 // 明细