opt: Long转String

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java

@@ -29,7 +29,7 @@ public class SchBasePoint extends Model<SchBasePoint> {
      * 点位标识
      */
     @TableId(value = "point_id", type = IdType.NONE)
-    private Long point_id;
+    private String point_id;
 
 
     /**

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java

@@ -101,5 +101,7 @@ public interface IStIvtIostorinvdisService extends IService<StIvtIostorinvdis> {
      * @return
      */
     List<StIvtIostorinvdis> getBillDisByDtlId(String iostorinvdtlId);
+
+    List<JSONObject> getAllOverdueByDtlId(String iostorinvdtlId);
 }
 

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinv.java

@@ -342,6 +342,10 @@ public class StIvtIostorinv implements Serializable {
      * 车型
      */
     private String car_type;
+    /**
+     * 是否超期发货
+     */
+    private String is_overdue;
 
     @TableField(exist = false)
     private String vbeln;

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdis.java

@@ -79,7 +79,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 物料标识
      */
-    private Long material_id;
+    private String material_id;
 
     /**
      * 批次
@@ -119,7 +119,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 数量计量单位标识
      */
-    private Long qty_unit_id;
+    private String qty_unit_id;
 
     /**
      * 数量计量单位名称
@@ -139,7 +139,7 @@ public class StIvtIostorinvdis implements Serializable {
     /**
      * 出入点位标识
      */
-    private Long point_id;
+    private String point_id;
 
     /**
      * 箱号

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/StIvtIostorinvdtl.java

@@ -44,7 +44,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 物料标识
      */
-    private Long material_id;
+    private String material_id;
 
     /**
      * 批次
@@ -64,7 +64,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 数量计量单位标识
      */
-    private Long qty_unit_id;
+    private String qty_unit_id;
 
     /**
      * 数量计量单位名称
@@ -84,7 +84,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 来源单据明细标识
      */
-    private Long source_billdtl_id;
+    private String source_billdtl_id;
 
     /**
      * 来源单据类型
@@ -104,7 +104,7 @@ public class StIvtIostorinvdtl implements Serializable {
     /**
      * 基础单据明细标识
      */
-    private Long base_billdtl_id;
+    private String base_billdtl_id;
 
     /**
      * 基础单据类型

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java

@@ -1762,7 +1762,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             disDaoList.forEach(row -> {
                 row.setWork_status(IOSEnum.WORK_STATUS.code("生成"));
                 row.setTask_id(task_id);
-                row.setPoint_id(jsonPoint.getLongValue("point_id"));
+                row.setPoint_id(jsonPoint.getString("point_id"));
             });
             iStIvtIostorinvdisService.updateBatchById(disDaoList);
         }
@@ -1908,7 +1908,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             disDaoList.forEach(row -> {
                 row.setWork_status(IOSEnum.WORK_STATUS.code("生成"));
                 row.setTask_id(task_id);
-                row.setPoint_id(jsonPoint.getLongValue("point_id"));
+                row.setPoint_id(jsonPoint.getString("point_id"));
             });
             iStIvtIostorinvdisService.updateBatchById(disDaoList);
         }

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +20,7 @@ import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinvdis;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.mapper.StIvtIostorinvdisMapper;
 import org.nl.common.domain.query.PageQuery;
+import org.nl.common.utils.CollectionUtils;
 import org.nl.common.utils.IdUtil;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.st.outbill.service.dto.OutBillTaskParam;
@@ -92,13 +94,13 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
                         .sect_name(json.getString("sect_name"))
                         .struct_code(json.getString("struct_code"))
                         .struct_name(json.getString("struct_name"))
-                        .material_id(json.getLongValue("material_id"))
+                        .material_id(json.getString("material_id"))
                         .pcsn(json.getString("pcsn"))
                         .quality_scode(json.getString("quality_scode"))
                         .work_status(json.getString("work_status"))
                         .storagevehicle_code(json.getString("box_no"))
                         .is_issued(IOSEnum.IS_NOTANDYES.code("否"))
-                        .qty_unit_id(json.getLongValue("qty_unit_id"))
+                        .qty_unit_id(json.getString("qty_unit_id"))
                         .qty_unit_name(json.getString("qty_unit_name"))
                         .plan_qty(json.getBigDecimal("plan_qty"))
                         .real_qty(json.getBigDecimal("real_qty"))
@@ -118,7 +120,7 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
                     disDao.setStoragevehicle_id(json.getString("storagevehicle_id"));
                 }
                 if (ObjectUtil.isNotEmpty(json.getString("point_id"))) {
-                    disDao.setPoint_id(json.getLongValue("point_id"));
+                    disDao.setPoint_id(json.getString("point_id"));
                 }
 
                 // 如果是退货入库则品质类型为 不良品
@@ -322,4 +324,13 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
         lam.eq(StIvtIostorinvdis::getIostorinvdtl_id, iostorinvdtlId);
         return list(lam);
     }
+
+    @Override
+    public List<JSONObject> getAllOverdueByDtlId(String iostorinvdtlId) {
+        LambdaQueryWrapper<StIvtIostorinvdis> lam = new LambdaQueryWrapper<>();
+        lam.eq(StIvtIostorinvdis::getIostorinvdtl_id, iostorinvdtlId)
+                .eq(StIvtIostorinvdis::getIs_overdue, "1");
+        List<StIvtIostorinvdis> list = list(lam);
+        return CollectionUtils.mapList(list, dis -> (JSONObject) JSON.toJSON(dis));
+    }
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdtlServiceImpl.java

@@ -118,11 +118,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
                     .iostorinvdtl_id(IdUtil.getStringId())
                     .iostorinv_id(iostorinv_id)
                     .seq_no(BigDecimal.valueOf(i+1))
-                    .material_id(materDao.getLongValue("material_id"))
+                    .material_id(materDao.getString("material_id"))
                     .pcsn(row.getString("container_name"))
                     .quality_scode(row.getString("quality_scode"))
                     .bill_status(IOSEnum.BILL_STATUS.code("生成"))
-                    .qty_unit_id(unitDao.getLongValue("measure_unit_id"))
+                    .qty_unit_id(unitDao.getString("measure_unit_id"))
                     .qty_unit_name(unitDao.getString("unit_name"))
                     .plan_qty(row.getBigDecimal("plan_qty"))
                     .source_bill_type(row.getString("source_bill_type"))
@@ -140,11 +140,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
                     .width(row.getString("width")).build();
 
             if (ObjectUtil.isNotEmpty(row.getString("source_billdtl_id"))) {
-                dtlDao.setSource_billdtl_id(row.getLongValue("source_billdtl_id"));
+                dtlDao.setSource_billdtl_id(row.getString("source_billdtl_id"));
             }
 
             if (ObjectUtil.isNotEmpty(row.getString("base_billdtl_id"))) {
-                dtlDao.setBase_billdtl_id(row.getLongValue("base_billdtl_id"));
+                dtlDao.setBase_billdtl_id(row.getString("base_billdtl_id"));
             }
 
             if (mstDao.getBill_type().equals(IOSEnum.IN_TYPE.code("调拨入库"))) {
@@ -231,11 +231,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
                     .iostorinvdtl_id(IdUtil.getStringId())
                     .iostorinv_id(iostorinv_id)
                     .seq_no(BigDecimal.valueOf(i+1))
-                    .material_id(materDao.getLongValue("material_id"))
+                    .material_id(materDao.getString("material_id"))
                     .pcsn(row.getString("pcsn"))
                     .quality_scode(row.getString("quality_scode"))
                     .bill_status(IOSEnum.BILL_STATUS.code("生成"))
-                    .qty_unit_id(unitDao.getLongValue("measure_unit_id"))
+                    .qty_unit_id(unitDao.getString("measure_unit_id"))
                     .qty_unit_name(unitDao.getString("unit_name"))
                     .plan_qty(row.getBigDecimal("plan_qty"))
                     .source_bill_type(row.getString("source_bill_type"))
@@ -253,11 +253,11 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
                     .width(row.getString("width")).build();
 
             if (ObjectUtil.isNotEmpty(row.getString("source_billdtl_id"))) {
-                dtlDao.setSource_billdtl_id(row.getLongValue("source_billdtl_id"));
+                dtlDao.setSource_billdtl_id(row.getString("source_billdtl_id"));
             }
 
             if (ObjectUtil.isNotEmpty(row.getString("base_billdtl_id"))) {
-                dtlDao.setBase_billdtl_id(row.getLongValue("base_billdtl_id"));
+                dtlDao.setBase_billdtl_id(row.getString("base_billdtl_id"));
             }
 
             dtlDaoList.add(dtlDao);

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java

@@ -205,7 +205,7 @@ public class OutBussManageServiceImpl implements OutBussManageService {
         } else {
             // 确定子卷: 找相同物料、批次的箱子
             List<JSONObject> likePcsnBoxList = ivtList.stream()
-                    .filter(row -> row.getString("material_id").equals(dtlDao.getMaterial_id().toString()) &&
+                    .filter(row -> row.getString("material_id").equals(dtlDao.getMaterial_id()) &&
                             row.getString("pcsn").equals(dtlDao.getPcsn())
                     )
                     .collect(Collectors.toList());
@@ -326,13 +326,13 @@ public class OutBussManageServiceImpl implements OutBussManageService {
                     .struct_id(jsonIvt.getString("struct_id"))
                     .struct_code(jsonIvt.getString("struct_code"))
                     .struct_name(jsonIvt.getString("struct_name"))
-                    .material_id(jsonIvt.getLongValue("material_id"))
+                    .material_id(jsonIvt.getString("material_id"))
                     .pcsn(jsonIvt.getString("pcsn"))
                     .quality_scode(jsonIvt.getString("quality_scode"))
                     .storagevehicle_id(jsonIvt.getString("storagevehicle_id"))
                     .storagevehicle_code(jsonIvt.getString("storagevehicle_code"))
                     .is_issued(IOSEnum.IS_NOTANDYES.code("否"))
-                    .qty_unit_id(jsonUnit.getLongValue("measure_unit_id"))
+                    .qty_unit_id(jsonUnit.getString("measure_unit_id"))
                     .qty_unit_name(jsonUnit.getString("unit_name"))
                     .plan_qty(jsonIvt.getBigDecimal("canuse_qty"))
                     .real_qty(jsonIvt.getBigDecimal("canuse_qty"))

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/md/dao/MdMeMaterialBase.java

@@ -25,7 +25,7 @@ public class MdMeMaterialBase implements Serializable {
      * 防止精度丢失
      */
     @TableId
-    private Long material_id;
+    private String material_id;
 
     /**
      * 物料编码
@@ -43,9 +43,9 @@ public class MdMeMaterialBase implements Serializable {
 
     private String english_name;
 
-    private Long base_unit_id;
+    private String base_unit_id;
 
-    private Long ass_unit_id;
+    private String ass_unit_id;
 
 
     private String approve_fileno;
@@ -55,9 +55,9 @@ public class MdMeMaterialBase implements Serializable {
     /**
      * 物料分类
      */
-    private Long material_type_id;
+    private String material_type_id;
 
-    private Long len_unit_id;
+    private String len_unit_id;
 
     private BigDecimal length;
 
@@ -68,23 +68,23 @@ public class MdMeMaterialBase implements Serializable {
     /**
      * 计量单位
      */
-    private Long weight_unit_id;
+    private String weight_unit_id;
 
     private BigDecimal gross_weight;
 
     private BigDecimal net_weight;
 
-    private Long cubage_unit_id;
+    private String cubage_unit_id;
 
     private BigDecimal cubage;
 
-    private Long create_id;
+    private String create_id;
 
     private String create_name;
 
     private String create_time;
 
-    private Long update_optid;
+    private String update_optid;
 
     private String update_optname;
 

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/InchargeServiceImpl.java

@@ -457,7 +457,7 @@ public class InchargeServiceImpl implements InchargeService {
                 outDis.setMaterial_id(inDis.getMaterial_id());
                 outDis.setPcsn(inDis.getPcsn());
                 outDis.setBox_no(inDis.getBox_no());
-                outDis.setPoint_id(0L);
+                outDis.setPoint_id("0");
                 outDis.setTask_id("");
                 outDis.setQuality_scode("01");
                 // 如果是虚拟库区则将执行状态改为生成：01

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/OutChargeServiceImpl.java

@@ -356,7 +356,7 @@ public class OutChargeServiceImpl implements OutChargeService {
             disRow.setSect_name("");
             disRow.setWork_status("00");
             disRow.setReal_qty(BigDecimal.ZERO);
-            disRow.setPoint_id(0L);
+            disRow.setPoint_id("0");
             disRow.setTask_id("");
             needSaveDisList.add(disRow);
             //将包装关系中对应的记录状态改为包装

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -102,5 +102,16 @@ public class CheckOutBillController {
         iStIvtIostorinvOutService.cancelDiv(whereJson);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
+    @PostMapping("/updataIsOverdue")
+    @Log("更新是否超期")
+    public ResponseEntity<Object> updataIsOverdue(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(checkOutBillService.updataIsOverdue(whereJson),HttpStatus.OK);
+    }
 
+    @PostMapping("/allSetPoint")
+    @Log("一键设置")
+    public ResponseEntity<Object> allSetPoint(@RequestBody JSONObject whereJson) {
+        iStIvtIostorinvOutService.allSetPoint(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java

@@ -61,4 +61,12 @@ public interface CheckOutBillService {
      * @return
      */
     JSONArray getOutBillTask(Map whereJson);
+
+    /**
+     * 更新是否超期
+     * @param whereJson {
+     *                  主表数据
+     * }
+     */
+    JSONObject updataIsOverdue(JSONObject whereJson);
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -3,9 +3,11 @@ package org.nl.wms.st.outbill.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdisService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvdtlService;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv;
@@ -16,7 +18,6 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.StringDealUtils;
 import org.nl.modules.wql.WQL;
-import org.nl.wms.basedata.st.service.StructivtService;
 import org.nl.wms.st.outbill.service.CheckOutBillService;
 import org.nl.wms.st.outbill.service.dto.OutBillDtlQueryParam;
 import org.nl.wms.st.outbill.service.dto.OutBillQueryPageParam;
@@ -25,7 +26,6 @@ import org.nl.wms.st.outbill.service.dto.StockMaterialQueryParam;
 import org.nl.wms.st.outbill.service.vo.OutBillDtlVo;
 import org.nl.wms.st.outbill.service.vo.OutBillTaskVo;
 import org.nl.wms.st.outbill.service.vo.StockMaterialVo;
-import org.nl.wms.stat.service.vo.PastStructPageVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -48,9 +48,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
     @Autowired
     private StIvtBsrealstorattrService bsrealstorattrService;
     @Autowired
+    private IStIvtIostorinvService stIvtIostorinvService;
+    @Autowired
     private StIvtIostorinvMapper stIvtIostorinvMapper;
     @Autowired
     private StIvtStructivtMapper stIvtStructivtMapper;
+
     @Override
     public List<OutBillDtlVo> getOutBillDtl(OutBillDtlQueryParam param) {
         return iostorinvdtlService.getOutBillDtl(param);
@@ -137,6 +140,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 .getResultJSONArray(0);
         return jo;
     }
+
     @Override
     public JSONArray getOutBillTask(Map whereJson) {
         HashMap<String, String> map = new HashMap<>(whereJson);
@@ -153,4 +157,23 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         }
         return jo;
     }
+
+    @Override
+    public JSONObject updataIsOverdue(JSONObject whereJson) {
+        // 更新主表
+        StIvtIostorinv jsonMst = stIvtIostorinvService.getById(whereJson.getString("iostorinv_id"));
+        jsonMst.setIs_overdue("1");
+        stIvtIostorinvService.updateById(jsonMst);
+
+        // 计算超期数量
+        List<JSONObject> disList = iostorinvdisService.getAllOverdueByDtlId(whereJson.getString("iostorinvdtl_id"));
+        double overdue_qyt = disList.stream()
+                .map(row -> row.getDoubleValue("plan_qty"))
+                .reduce(Double::sum).orElse(0.00);
+
+        JSONObject result = new JSONObject();
+        result.put("overdue_qyt", overdue_qyt);
+        result.put("mst", jsonMst);
+        return result;
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/vo/OutBillDtlVo.java

@@ -30,7 +30,7 @@ public class OutBillDtlVo implements Serializable {
     /**
      * 物料标识
      */
-    private Long material_id;
+    private String material_id;
 
     /**
      * 批次
@@ -50,7 +50,7 @@ public class OutBillDtlVo implements Serializable {
     /**
      * 数量计量单位标识
      */
-    private Long qty_unit_id;
+    private String qty_unit_id;
 
     /**
      * 数量计量单位名称
@@ -70,7 +70,7 @@ public class OutBillDtlVo implements Serializable {
     /**
      * 来源单据明细标识
      */
-    private Long source_billdtl_id;
+    private String source_billdtl_id;
 
     /**
      * 来源单据类型
@@ -90,7 +90,7 @@ public class OutBillDtlVo implements Serializable {
     /**
      * 基础单据明细标识
      */
-    private Long base_billdtl_id;
+    private String base_billdtl_id;
 
     /**
      * 基础单据类型