添加批次号管理

src/main/java/com/topsunit/scanservice/ximai/common/Constants.java

@@ -56,6 +56,11 @@ public class Constants {
      */
     public static final String LOGIN_FAIL = "Error";
 
+    /**
+     * 默认批号
+     */
+    public static final String BATCH_DEF = Constants.BATCH_DEF;
+
     /**
      * 验证码 redis key
      */

src/main/java/com/topsunit/scanservice/ximai/controller/MoctaController.java

@@ -40,6 +40,11 @@ public class MoctaController {
     Optional<MoctaDocDto> getForDoc(@RequestBody MoctaIdCriteria criteria){
         return moctaService.getForDoc(criteria);
     }
+    @ApiOperation("获取工单信息")
+    @PostMapping("/mocta/get")
+    Optional<MoctaDto> get(@RequestBody MoctaIdCriteria criteria){
+        return moctaService.get(criteria);
+    }
 
     @ApiOperation("获取文件列表")
     @PostMapping("/mocta/getfordocList")

src/main/java/com/topsunit/scanservice/ximai/dto/CopthCreateParams.java

 package com.topsunit.scanservice.ximai.dto;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -47,7 +48,7 @@ public class CopthCreateParams {
     @ApiModelProperty("订单序号")
     private String th016;
     @ApiModelProperty("批号")
-    private String th017="********************";
+    private String th017= Constants.BATCH_DEF;
     @ApiModelProperty("备注")
     private String th018;
     @ApiModelProperty("客户品号")

src/main/java/com/topsunit/scanservice/ximai/dto/IInvmlDto.java

@@ -33,4 +33,7 @@ public interface IInvmlDto {
 
     @ApiModelProperty("库存数量")
     public BigDecimal getMl005();
+
+    @ApiModelProperty("最近入库日")
+    public String getMl009();
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvmlDto.java

@@ -43,4 +43,9 @@ public class InvmlDto {
      */
     @ApiModelProperty("库存数量")
     private BigDecimal ml005;
+    /**
+     * 最近入库日
+     */
+    @ApiModelProperty("最近入库日")
+    private String ml009;
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvtaCreateParams.java

 package com.topsunit.scanservice.ximai.dto;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -73,5 +74,5 @@ public class InvtaCreateParams {
     @ApiModelProperty("单据来源")
     private String ta025="1";
     @ApiModelProperty("批号")
-    private String ta033="********************";
+    private String ta033= Constants.BATCH_DEF;
 }

src/main/java/com/topsunit/scanservice/ximai/dto/InvtbCreateParams.java

 package com.topsunit.scanservice.ximai.dto;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -44,7 +45,7 @@ public class InvtbCreateParams {
     @ApiModelProperty("转入库")
     private String tb013="";
     @ApiModelProperty("批号")
-    private String tb014="********************";
+    private String tb014= Constants.BATCH_DEF;
     @ApiModelProperty("有效日期")
     private String tb015="";
     @ApiModelProperty("复检日期")

src/main/java/com/topsunit/scanservice/ximai/dto/InvtbCreateParamsAllo.java

 package com.topsunit.scanservice.ximai.dto;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -43,7 +44,7 @@ public class InvtbCreateParamsAllo {
     @ApiModelProperty("转入库")
     private String tb013="";
     @ApiModelProperty("批号")
-    private String tb014="********************";
+    private String tb014= Constants.BATCH_DEF;
     @ApiModelProperty("有效日期")
     private String tb015="";
     @ApiModelProperty("复检日期")

src/main/java/com/topsunit/scanservice/ximai/dto/MoctaDto.java

@@ -22,11 +22,11 @@ public class MoctaDto {
     private String ta003;
     /*BOM日期[FORMATE:YMD]*/
     private String ta004;
-    /*BOM版本*/
+    @ApiModelProperty("BOM版本")
     private String ta005;
-    /*产品品号*/
+    @ApiModelProperty("产品品号")
     private String ta006;
-    /*单位*/
+    @ApiModelProperty("单位")
     private String ta007;
     /*预留字段 小单位*/
     private String ta008;
@@ -41,16 +41,17 @@ public class MoctaDto {
     /*审核码 Y、N、V*/
     private String ta013;
     /*实际完工[FORMATE:YMD]*/
+    @ApiModelProperty("实际完工[FORMATE:YMD]")
     private String ta014;
-    /*预计产量*/
+    @ApiModelProperty("预计产量")
     private BigDecimal ta015;
-    /*已领套数*/
+    @ApiModelProperty("已领套数")
     private BigDecimal ta016;
-    /*已生产量*/
+    @ApiModelProperty("已生产量")
     private BigDecimal ta017;
     /*报废数量*/
     private BigDecimal ta018;
-    /*工厂编号*/
+    @ApiModelProperty("工厂编号")
     private String ta019;
     /*入库仓库*/
     private String ta020;

src/main/java/com/topsunit/scanservice/ximai/dto/MoctfCreateParams2.java

@@ -29,5 +29,7 @@ public class MoctfCreateParams2 {
     private String tg014;
     @ApiModelProperty("工单单号")
     private String tg015;
+    @ApiModelProperty("批号")
+    private String batchNo;
 
 }

src/main/java/com/topsunit/scanservice/ximai/dto/MoctgCreateParams.java

 package com.topsunit.scanservice.ximai.dto;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -54,7 +55,7 @@ public class MoctgCreateParams {
     @ApiModelProperty("检验状态")
     private String tg016="0";
     @ApiModelProperty("批号")
-    private String tg017="********************";
+    private String tg017= Constants.BATCH_DEF;
     @ApiModelProperty("急料")
     private String tg024;
     @ApiModelProperty("生产日期")

src/main/java/com/topsunit/scanservice/ximai/dto/PurcdDto.java

@@ -40,5 +40,7 @@ public class PurcdDto {
     private BigDecimal cd018;
     private BigDecimal cd019;
     private String cd034;
+    @ApiModelProperty("批号")
+    private String udf07;
 
 }

src/main/java/com/topsunit/scanservice/ximai/dto/PurthCreateDto.java

@@ -3,6 +3,7 @@ package com.topsunit.scanservice.ximai.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.math.BigDecimal;
 
 /**
@@ -53,4 +54,6 @@ public class PurthCreateDto {
 
     @ApiModelProperty("")
     private Boolean islot = false;
+    @ApiModelProperty("批号")
+    private String cd017;
 }

src/main/java/com/topsunit/scanservice/ximai/dto/StockAllocateParams.java

@@ -25,6 +25,8 @@ public class StockAllocateParams {
         String warehouse;
         @ApiModelProperty("储位")
         String location;
+        @ApiModelProperty("批号")
+        String batchNo;
         @ApiModelProperty("调拨数量")
         BigDecimal allocateQuantity;
         @ApiModelProperty("调入仓库")

src/main/java/com/topsunit/scanservice/ximai/dto/StockSaleOutParams.java

@@ -35,5 +35,7 @@ public class StockSaleOutParams {
         String warehouse;
         @ApiModelProperty("储位")
         String location;
+        @ApiModelProperty("批号")
+        String batchNo;
     }
 }

src/main/java/com/topsunit/scanservice/ximai/dto/StockTakingParams.java

@@ -25,6 +25,8 @@ public class StockTakingParams {
         String warehouse;
         @ApiModelProperty("储位")
         String location;
+        @ApiModelProperty("批号")
+        String batchNo;
         @ApiModelProperty("库存数量")
         BigDecimal stockQuantity;
         @ApiModelProperty("盘点数量")

src/main/java/com/topsunit/scanservice/ximai/dto/StockTransactionParams.java

@@ -19,6 +19,8 @@ public class StockTransactionParams {
     String warehouse;
     @ApiModelProperty("储位")
     String location;
+    @ApiModelProperty("批号")
+    String batchNo;
     @ApiModelProperty("操作数量")
     BigDecimal quantity;
     @ApiModelProperty("调入仓库")

src/main/java/com/topsunit/scanservice/ximai/entity/Purcd.java

@@ -49,7 +49,7 @@ public class Purcd extends EntityBase {
     private String cd015;
     @ApiModelProperty("到货仓")
     private String cd016;
-    @Column
+    @ApiModelProperty("批号")
     private String cd017;
     @Column
     private BigDecimal cd018;

src/main/java/com/topsunit/scanservice/ximai/service/CopthService.java

@@ -93,6 +93,9 @@ public class CopthService {
             copth.setTh014(copto.getTo004());
             copth.setTh015(copto.getTo005());
             copth.setTh016(copto.getTo006());
+            if(StringUtils.isNotBlank(s.getBatchNo())){
+                copth.setTh017(s.getBatchNo());
+            }
             copth.setTh045(copto.getTo001());
             copth.setTh046(copto.getTo002());
             copth.setTh047(copto.getTo003());

src/main/java/com/topsunit/scanservice/ximai/service/InvmcService.java

@@ -11,6 +11,7 @@ import com.topsunit.scanservice.ximai.entity.Invmb;
 import com.topsunit.scanservice.ximai.entity.Invmc;
 import com.topsunit.scanservice.ximai.entity.Invml;
 import com.topsunit.scanservice.ximai.utils.MessageUtils;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +74,7 @@ public class InvmcService {
         return invmlMapper.toInvmlDto(list);
     }
 
+    @ApiOperation("查询库存")
     public List<InvmlDto> getInvmlList2(InvmlCriteria criteria) {
         invmbDao.findById(criteria.getMl001()).orElseThrow(()->new TopsunitException(MessageUtils.getMessage("未找到物料：")+criteria.getMl001()));
 

src/main/java/com/topsunit/scanservice/ximai/service/InvtaService.java

@@ -139,6 +139,7 @@ public class InvtaService {
             invtb.setTb012(detail.getWarehouse());
             invtb.setTb019(currDate);
             invtb.setTb029(detail.getLocation());
+            invtb.setTb014(detail.getBatchNo());
             //判断调拨库位是否与当前一致
             if(StringUtils.isNotEmpty(detail.getAllocateWarehouse()) &&
                     StringUtils.isNotEmpty(detail.getAllocateLocation())){

src/main/java/com/topsunit/scanservice/ximai/service/MoctaService.java

@@ -66,6 +66,11 @@ public class MoctaService {
                 });
     }
 
+    public Optional<MoctaDto> get(MoctaIdCriteria criteria) {
+        return moctaDao.findById(moctaMapper.toMoctaId(criteria))
+                .map(moctaMapper::toMoctaDto);
+    }
+
     public MoctaDocDto getForDoc2(MoctaIdCriteria criteria) {
         MoctaDocDto dto = moctaDao.findById(moctaMapper.toMoctaId(criteria))
                 .map(moctaMapper::toMoctaDocDto).orElse(new MoctaDocDto());

src/main/java/com/topsunit/scanservice/ximai/service/MoctcService.java

 package com.topsunit.scanservice.ximai.service;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import com.topsunit.scanservice.ximai.common.DateUtil;
 import com.topsunit.scanservice.ximai.common.StringUtil;
 import com.topsunit.scanservice.ximai.common.TopsunitException;
@@ -253,7 +254,7 @@ public class MoctcService {
 //                throw new TopsunitException(MessageUtils.getMessage("批管理品号{0}必须录入批号。", mocteCreateParams.getTb003()));
 //            }
 //        });
-        invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), "********************")
+        invmlDao.findFirstByMl001AndMl002AndMl003AndMl004(mocteCreateParams.getTb003(), mocteCreateParams.getTe008(), mocteCreateParams.getTe025(), Constants.BATCH_DEF)
                 .filter(i -> i.getMl005().compareTo(mocteCreateParams.getQuantity()) >= 0)
                 .orElseThrow(() -> new TopsunitException(MessageUtils.getMessage("品号{0}库存不足。", mocteCreateParams.getTb003().trim())));
 

src/main/java/com/topsunit/scanservice/ximai/service/MoctfService.java

@@ -7,6 +7,7 @@ import com.topsunit.scanservice.ximai.dao.*;
 import com.topsunit.scanservice.ximai.dto.*;
 import com.topsunit.scanservice.ximai.entity.*;
 import com.topsunit.scanservice.ximai.utils.MessageUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -90,11 +91,13 @@ public class MoctfService {
         moctg.setTg007(invmb.getMb004());
         moctg.setTg013(create.getTg011());
         moctg.setTg037(invmb.getMb004());
-        moctg.setTg010(invmb.getMb017());
+        moctg.setTg010(create.getTg010());
+        moctg.setTg017(create.getBatchNo());
+        if(StringUtils.isBlank(create.getBatchNo())){
+            throw new TopsunitException(MessageUtils.getMessage("批管理品号{0}必须录入批号。", moctg.getTg005()));
+        }
         ta083.set(mocta.getTa083());
-        //查询物料默认仓库
-        Invmc invmc = invmcDao.findById(new InvmcId(invmb.getMb001(), invmb.getMb017())).orElseThrow(()->new TopsunitException(MessageUtils.getMessage("未找到对应物料默认库：{0},{1}", invmb.getMb001(), invmb.getMb017())));
-        moctg.setTg036(invmc.getMc015());
+        moctg.setTg036(create.getTg036());
         moctg.setTg030(currStr);
         moctg.setTg038(moctg.getTg011());
         moctgDao.save(moctg);

src/main/java/com/topsunit/scanservice/ximai/service/PurccService.java

@@ -12,12 +12,14 @@ import com.topsunit.scanservice.ximai.security.CurrentActor;
 import com.topsunit.scanservice.ximai.utils.MessageUtils;
 import com.topsunit.scanservice.ximai.webapi.PrintApi;
 import com.topsunit.scanservice.ximai.webapi.dto.PrintField;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -183,6 +185,7 @@ public class PurccService {
                 objectMap.add(PrintField.of("CD006", j.getCd006().trim()));
                 objectMap.add(PrintField.of("UDF01", j.getUdf01().trim()));
                 objectMap.add(PrintField.of("UDF02", j.getUdf02().trim()));
+                objectMap.add(PrintField.of("CD017", j.getCd017().trim()));//批号
                 objectMap.add(PrintField.of("CC010", optionalPurcc
                         .map(Purcc::getCc010)
                         .map(DateUtil::stringToLocalDate)
@@ -224,6 +227,7 @@ public class PurccService {
         return byMc001.stream().findFirst();
     }
 
+    @ApiOperation("")
     @Transactional
     public void create(StockArrivalParams stockArrivalParams){
         if(CollectionUtil.isEmpty(stockArrivalParams.getDetails())){
@@ -271,6 +275,12 @@ public class PurccService {
             purcd.setCd013(detail.getArrivalQuantity());
             purcd.setCd015(purtd.getTd009());
             purcd.setCd016(purtd.getTd007());
+            //按批管理
+            if("Y".equalsIgnoreCase(invmb.getMb022())){
+                purcd.setCd017(buildBatch(detail));//生成到货批次号
+            }else{
+                purcd.setCd017(Constants.BATCH_DEF);//生成到货批次号
+            }
             purcd.setCd021(invmb.getMb004());
             purcdDao.save(purcd);
             sumQuantity = sumQuantity.add(detail.getArrivalQuantity());
@@ -299,4 +309,11 @@ public class PurccService {
                 })
                 .orElse(prefix + "001");
     }
+
+    //生成批次号：产品+客户+日期yyyyMMdd
+    private String buildBatch(StockArrivalParams.StockArrivalDetail detail){
+        String rst = detail.getMaterialNo()+detail.getSupplierNo();
+        rst+= cn.hutool.core.date.DateUtil.format(LocalDateTime.now(), "yyyyMMdd");
+        return rst;
+    }
 }

src/main/java/com/topsunit/scanservice/ximai/service/PurtgService.java

 package com.topsunit.scanservice.ximai.service;
 
-import com.topsunit.scanservice.ximai.common.DateUtil;
-import com.topsunit.scanservice.ximai.common.OrdinalHelper;
-import com.topsunit.scanservice.ximai.common.StringUtil;
-import com.topsunit.scanservice.ximai.common.TopsunitException;
+import com.topsunit.scanservice.ximai.common.*;
 import com.topsunit.scanservice.ximai.dao.*;
 import com.topsunit.scanservice.ximai.dto.PurtgCreateCriteria;
 import com.topsunit.scanservice.ximai.dto.PurtgCreateDto;
@@ -217,7 +214,11 @@ public class PurtgService {
                     purth.setTh007(localPurcd.getCd018()); // 进货数量
                     purth.setTh008(localPurcd.getCd007()); // 单位
                     purth.setTh009(purthCreateParams.getTh009()); // 仓库
-                    purth.setTh010("********************"); // 批号
+                    if(StringUtil.isNullOrEmpty(localPurcd.getCd017())){
+                        purth.setTh010(Constants.BATCH_DEF); // 批号
+                    }else{
+                        purth.setTh010(localPurcd.getCd017());
+                    }
                     purth.setTh011(localPurcd.getCd010()); // 采购单别
                     purth.setTh012(localPurcd.getCd011()); // 采购单号
                     purth.setTh013(localPurcd.getCd012()); // 采购序号

src/main/java/com/topsunit/scanservice/ximai/service/SfctbService.java

 package com.topsunit.scanservice.ximai.service;
 
+import com.topsunit.scanservice.ximai.common.Constants;
 import com.topsunit.scanservice.ximai.common.DateUtil;
 import com.topsunit.scanservice.ximai.common.TopsunitException;
 import com.topsunit.scanservice.ximai.dao.*;
@@ -145,7 +146,7 @@ public class SfctbService {
         // tc029
         // tc030
         // tc031
-        sfctc.setTc032("********************"); // 批号
+        sfctc.setTc032(Constants.BATCH_DEF); // 批号
         // tc033
         // tc034
         sfctc.setTc035("N"); // 急料