#库龄按批次计算

LSH

2023-12-16 4d26b26adb0750aaf8920a9b7613be59711577ca

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -29,6 +29,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;

/**
@@ -968,7 +969,8 @@
        if (Cools.isEmpty(jsonLocNo)){
            return R.error("库位号参数为空！");
        }else if (Cools.isEmpty(ownerId)){
            return R.error("拥有者参数为空！");
//            return R.error("拥有者参数为空！");
            ownerId = 1L;
        }else if (Cools.isEmpty(jsonCode)){
            return R.error("条码参数为空！");
        }else if (Cools.isEmpty(jsonOrigin)){
@@ -1045,6 +1047,12 @@
                // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                manLocDetl.setStockFreeze(1);
                manLocDetl.setOwner(jsonOwner);
                try {
                    Date produceTime = DateUtils.convert(manLocDetl.getBatch(),DateUtils.yyyyMMdd);
                    manLocDetl.setProduceTime(produceTime);
                } catch (Exception e) {
                    manLocDetl.setProduceTime(now);
                }

                if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                    return R.error("物料信息入库失败");
@@ -1063,7 +1071,8 @@
        if (Cools.isEmpty(jsonLocNo)){
            return R.error("库位号参数为空！");
        }else if (Cools.isEmpty(ownerId)){
            return R.error("拥有者参数为空！");
//            return R.error("拥有者参数为空！");
            ownerId = 1L;
        }
        Integer jsonOwner = ownerId.intValue(); //获取拥有者
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", jsonLocNo));  //获取对应库位信息
@@ -1117,7 +1126,12 @@
                manLocDetl.setOwner(jsonOwner);
                // manLocDetl.setOrderNo(waitPakin.getOrderNo());
                manLocDetl.setStockFreeze(1);

                try {
                    Date produceTime = DateUtils.convert(jsonOriginDetl.getBatch(),DateUtils.yyyyMMdd);
                    manLocDetl.setProduceTime(produceTime);
                } catch (Exception e) {
                    manLocDetl.setProduceTime(now);
                }
                if (!manLocDetlService.insert(manLocDetl)){  //数据库插入实体类信息
                    return R.error("物料信息入库失败");
                }