杰生重构 标签

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/CheckDetailsInfo.java

@@ -19,6 +19,11 @@ public class CheckDetailsInfo {
     private String materialName;
 
     /**
+     * 物料编码
+     */
+    private String materialCode;
+
+    /**
      * 退仓面料详情
      */
     private List<StockBackDetails> stockBackDetailsList;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/contract/ContractDetails.java

@@ -21,6 +21,10 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class ContractDetails extends StorageBaseEntity {
 
+    /**
+     * 采购合同明细编码（原入库单号）
+     */
+    private String code;
 
     /**
      * 采购合同id

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterBatch.java

@@ -54,11 +54,21 @@ public class WaterBatch extends StorageBaseEntity {
     private Long contractId;
 
     /**
+     * 合同编号
+     */
+    private String contractCode;
+
+    /**
      * 合同明细id
      */
     private Long contractDetailsId;
 
     /**
+     * 合同明细编码
+     */
+    private String contractDetailsCode;
+
+    /**
      * 标签个数
      */
     private Integer tagCount;

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterBill.java

@@ -1,88 +0,0 @@
-package com.fjhx.entity.water;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.fjhx.base.StorageBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 出入库单
- * </p>
- *
- * @author ${author}
- * @since 2022-09-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class WaterBill extends StorageBaseEntity {
-
-
-    /**
-     * 入库单号
-     */
-    private String code;
-
-    /**
-     * 申购id
-     */
-    private Long applyPurchaseId;
-
-    /**
-     * 申购明细id
-     */
-    private Long applyPurchaseDetailsId;
-
-    /**
-     * 合同id
-     */
-    private Long contractId;
-
-    /**
-     * 合同明细id
-     */
-    private Long contractDetailsId;
-
-    /**
-     * 物料id
-     */
-    private Long materialId;
-
-    /**
-     * 供应商id
-     */
-    private Long supplierId;
-
-    /**
-     * 采购数量
-     */
-    private BigDecimal quantity;
-
-    /**
-     * 入库数量
-     */
-    private BigDecimal changeQuantity;
-
-    /**
-     * 完成时间
-     */
-    private Date completeTime;
-
-    /**
-     * 逻辑删除 0未删除 1已删除
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer delFlag;
-
-    private String oldId;
-
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterTag.java

@@ -103,16 +103,6 @@ public class WaterTag extends StorageBaseEntity {
     private Long labelUserId;
 
     /**
-     * 入库id
-     */
-    private Long waterBillId;
-
-    /**
-     * 入库编号
-     */
-    private String waterBillCode;
-
-    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/water/WaterBatchVo.java

@@ -14,9 +14,4 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class WaterBatchVo extends WaterBatch {
 
-    /**
-     * 合同编码
-     */
-    private String contractCode;
-
 }

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/water/WaterBillEx.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.water;
-
-import com.fjhx.entity.water.WaterBill;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 出入库单
- *
- * @author ${author}
- * @since 2022-09-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class WaterBillEx extends WaterBill {
-
-}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/water/WaterBillVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.water;
-
-import com.fjhx.entity.water.WaterBill;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 出入库单
- *
- * @author ${author}
- * @since 2022-09-20
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class WaterBillVo extends WaterBill {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/controller/contract/ContractController.java

@@ -34,18 +34,6 @@ public class ContractController {
     @Autowired
     private ContractFlowService contractFlowService;
 
-    @PostMapping("/add")
-    public R add(@RequestBody ContractVo contractVo) {
-        contractService.add(contractVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody ContractVo contractVo) {
-        contractService.edit(contractVo);
-        return R.success();
-    }
-
     @PostMapping("/delete")
     public R delete(@RequestBody ContractVo contractVo) {
         contractService.delete(contractVo);

hx-service/storage-restructure/src/main/java/com/fjhx/controller/contract/ContractDetailsController.java

@@ -1,18 +1,10 @@
 package com.fjhx.controller.contract;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.contract.ContractDetails;
-import com.fjhx.params.contract.ContractDetailsVo;
 import com.fjhx.service.contract.ContractDetailsService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * <p>
  * 采购合同明细 前端控制器
@@ -28,29 +20,5 @@ public class ContractDetailsController {
     @Autowired
     private ContractDetailsService contractDetailsService;
 
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<ContractDetails> result = contractDetailsService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody ContractDetailsVo contractDetailsVo){
-        contractDetailsService.add(contractDetailsVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody ContractDetailsVo contractDetailsVo){
-        contractDetailsService.edit(contractDetailsVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody ContractDetailsVo contractDetailsVo){
-        contractDetailsService.delete(contractDetailsVo);
-        return R.success();
-    }
-
 }
 

hx-service/storage-restructure/src/main/java/com/fjhx/controller/water/WaterBillController.java

@@ -1,56 +0,0 @@
-package com.fjhx.controller.water;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.water.WaterBill;
-import com.fjhx.params.water.WaterBillVo;
-import com.fjhx.service.water.WaterBillService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-09-20
- */
-@RestController
-@RequestMapping("/waterBill")
-public class WaterBillController {
-
-    @Autowired
-    private WaterBillService waterBillService;
-
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<WaterBill> result = waterBillService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody WaterBillVo waterBillVo){
-        waterBillService.add(waterBillVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody WaterBillVo waterBillVo){
-        waterBillService.edit(waterBillVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody WaterBillVo waterBillVo){
-        waterBillService.delete(waterBillVo);
-        return R.success();
-    }
-
-}
-

hx-service/storage-restructure/src/main/java/com/fjhx/controller/water/WaterTagController.java

@@ -39,6 +39,9 @@ public class WaterTagController {
         return R.success(result);
     }
 
+    /**
+     * 添加标签
+     */
     @PostMapping("/add")
     public R add(@RequestBody WaterTagVo waterTagVo) {
         waterTagService.add(waterTagVo);
@@ -46,6 +49,15 @@ public class WaterTagController {
     }
 
     /**
+     * 导入标签
+     */
+    @PostMapping("/uploadTag")
+    public R uploadTag(@RequestParam("file") MultipartFile file, @RequestParam("waterBatchId") Long waterBatchId) {
+        waterTagService.uploadTag(file, waterBatchId);
+        return R.success();
+    }
+
+    /**
      * 打印二维码
      */
     @PostMapping("/printer")
@@ -64,15 +76,6 @@ public class WaterTagController {
     }
 
     /**
-     * 导入标签
-     */
-    @PostMapping("/uploadTag")
-    public R uploadTag(@RequestParam("file") MultipartFile file, @RequestParam("waterBatchId") Long waterBatchId) {
-        waterTagService.uploadTag(file, waterBatchId);
-        return R.success();
-    }
-
-    /**
      * 删除标签流程
      */
     @PostMapping("/deleteFlowCreate")

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/contract/ContractMapper.xml

@@ -24,6 +24,7 @@
         select cd.contract_id,
                cd.contract_code,
                cd.id                                          contractDetailsId,
+               cd.code                                        contractDetailsCode,
                cd.apply_purchase_id,
                cd.apply_purchase_code,
                cd.apply_purchase_details_id,

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterBillMapper.java

@@ -1,16 +0,0 @@
-package com.fjhx.mapper.water;
-
-import com.fjhx.entity.water.WaterBill;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 出入库单 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-09-20
- */
-public interface WaterBillMapper extends BaseMapper<WaterBill> {
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterBillMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.water.WaterBillMapper">
-
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/ContractDetailsService.java

@@ -1,11 +1,7 @@
 package com.fjhx.service.contract;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.contract.ContractDetails;
-import com.fjhx.params.contract.ContractDetailsVo;
 import com.fjhx.base.StorageBaseService;
-
-import java.util.Map;
+import com.fjhx.entity.contract.ContractDetails;
 
 /**
  * <p>
@@ -17,12 +13,4 @@ import java.util.Map;
  */
 public interface ContractDetailsService extends StorageBaseService<ContractDetails> {
 
-    Page<ContractDetails> getPage(Map<String, String> condition);
-
-    void add(ContractDetailsVo contractDetailsVo);
-
-    void edit(ContractDetailsVo contractDetailsVo);
-
-    void delete(ContractDetailsVo contractDetailsVo);
-
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/ContractService.java

@@ -20,10 +20,6 @@ import java.util.Map;
  */
 public interface ContractService extends StorageBaseService<Contract> {
 
-    void add(ContractVo contractVo);
-
-    void edit(ContractVo contractVo);
-
     void delete(ContractVo contractVo);
 
     /**

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractDetailsServiceImpl.java

@@ -1,18 +1,11 @@
 package com.fjhx.service.contract.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.contract.ContractDetails;
-import com.fjhx.params.contract.ContractDetailsVo;
 import com.fjhx.mapper.contract.ContractDetailsMapper;
 import com.fjhx.service.contract.ContractDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 /**
  * <p>
  * 采购合同明细 服务实现类
@@ -24,31 +17,4 @@ import java.util.Map;
 @Service
 public class ContractDetailsServiceImpl extends ServiceImpl<ContractDetailsMapper, ContractDetails> implements ContractDetailsService {
 
-    @Override
-    public Page<ContractDetails> getPage(Map<String, String> condition) {
-
-        QueryWrapper<ContractDetails> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<ContractDetails> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(ContractDetailsVo contractDetailsVo) {
-        save(contractDetailsVo);
-    }
-
-    @Override
-    public void edit(ContractDetailsVo contractDetailsVo) {
-        updateById(contractDetailsVo);
-    }
-
-    @Override
-    public void delete(ContractDetailsVo contractDetailsVo) {
-        removeById(contractDetailsVo.getId());
-    }
-
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/contract/impl/ContractServiceImpl.java

@@ -47,16 +47,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
     private ContractDetailsService contractDetailsService;
 
     @Override
-    public void add(ContractVo contractVo) {
-        save(contractVo);
-    }
-
-    @Override
-    public void edit(ContractVo contractVo) {
-        updateById(contractVo);
-    }
-
-    @Override
     public void delete(ContractVo contractVo) {
         removeById(contractVo.getId());
     }
@@ -101,6 +91,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             BigDecimal quantity = applyPurchaseDetails.getQuantity();
 
             ContractDetails contractDetails = new ContractDetails();
+            contractDetails.setCode("SI-" + DateUtil.format(new Date(), "yyMMddHHmmss-SSSS"));
             contractDetails.setContractId(contractId);
             contractDetails.setContractCode(code);
             contractDetails.setApplyPurchaseId(applyPurchaseId);
@@ -117,7 +108,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             contractDetailsList.add(contractDetails);
         }
         contractDetailsService.saveBatch(contractDetailsList);
-
     }
 
     @Override

hx-service/storage-restructure/src/main/java/com/fjhx/service/flow/ContractFlowService.java

@@ -91,7 +91,6 @@ public class ContractFlowService {
                 .eq(ContractDetails::getContractId, id)
                 .set(ContractDetails::getPrice, price));
 
-
         flowConstructor.create(id, "合同审批", contractVo.getRemark(), contractVo);
     }
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/flow/DeleteTagService.java

@@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+/**
+ * 删除标签
+ */
 @Service
 public class DeleteTagService {
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/WaterBillService.java

@@ -1,28 +0,0 @@
-package com.fjhx.service.water;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.water.WaterBill;
-import com.fjhx.params.water.WaterBillVo;
-import com.fjhx.base.StorageBaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-09-20
- */
-public interface WaterBillService extends StorageBaseService<WaterBill> {
-
-    Page<WaterBill> getPage(Map<String, String> condition);
-
-    void add(WaterBillVo waterBillVo);
-
-    void edit(WaterBillVo waterBillVo);
-
-    void delete(WaterBillVo waterBillVo);
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/WaterTagService.java

@@ -24,10 +24,12 @@ public interface WaterTagService extends StorageBaseService<WaterTag> {
 
     void add(WaterTagVo waterTagVo);
 
+    void uploadTag(MultipartFile file, Long waterBatchId);
+
     void printer(List<Long> tagIdList);
 
-    void bindingRfid(Long id, String rfidCode);
+    void shipment(Long waterBatchId);
 
-    void uploadTag(MultipartFile file, Long waterBatchId);
+    void bindingRfid(Long id, String rfidCode);
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBatchServiceImpl.java

@@ -3,16 +3,15 @@ package com.fjhx.service.water.impl;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.StorageBaseEntity;
 import com.fjhx.constants.StatusConstant;
+import com.fjhx.entity.contract.ContractDetails;
 import com.fjhx.entity.water.WaterBatch;
-import com.fjhx.entity.water.WaterTag;
 import com.fjhx.mapper.water.WaterBatchMapper;
 import com.fjhx.params.water.WaterBatchVo;
+import com.fjhx.service.contract.ContractDetailsService;
 import com.fjhx.service.water.WaterBatchService;
 import com.fjhx.service.water.WaterTagService;
 import com.fjhx.utils.Assert;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +35,9 @@ public class WaterBatchServiceImpl extends ServiceImpl<WaterBatchMapper, WaterBa
     @Autowired
     private WaterTagService waterTagService;
 
+    @Autowired
+    private ContractDetailsService contractDetailsService;
+
     @Override
     public Map<String, Object> getDetailsByContract(Long contractId) {
         Map<String, Object> result = baseMapper.getMaterialInfo(contractId);
@@ -81,14 +83,27 @@ public class WaterBatchServiceImpl extends ServiceImpl<WaterBatchMapper, WaterBa
 
     @Override
     public synchronized void add(WaterBatchVo waterBatchVo) {
-        String contractCode = waterBatchVo.getContractCode();
-        String code = getCode(contractCode);
-        waterBatchVo.setCode(code);
-
+        Long contractDetailsId = waterBatchVo.getContractDetailsId();
+        Assert.notEmpty(contractDetailsId, "合同明细id不能为空");
+
+        ContractDetails contractDetails = contractDetailsService.getById(contractDetailsId);
+        Assert.notEmpty(contractDetails, "没有找到合同明细");
+
+        waterBatchVo.setMaterialId(contractDetails.getMaterialId());
+        waterBatchVo.setPrice(contractDetails.getPrice());
+        waterBatchVo.setApplyPurchaseId(contractDetails.getApplyPurchaseId());
+        waterBatchVo.setApplyPurchaseDetailsId(contractDetails.getApplyPurchaseDetailsId());
+        waterBatchVo.setContractId(contractDetails.getContractId());
+        waterBatchVo.setContractCode(contractDetails.getContractCode());
+        waterBatchVo.setContractDetailsId(contractDetails.getId());
+        waterBatchVo.setContractDetailsCode(contractDetails.getCode());
         waterBatchVo.setTagCount(0);
         waterBatchVo.setTagQuantitySum(BigDecimal.ZERO);
         waterBatchVo.setShipmentStatus(StatusConstant.NO);
 
+        String code = getCode(contractDetails.getContractCode());
+        waterBatchVo.setCode(code);
+
         save(waterBatchVo);
     }
 
@@ -112,13 +127,8 @@ public class WaterBatchServiceImpl extends ServiceImpl<WaterBatchMapper, WaterBa
         waterBatch.setShipmentTime(new Date());
         updateById(waterBatch);
 
-        waterTagService.update(Wrappers.<WaterTag>lambdaUpdate()
-                .eq(WaterTag::getWaterBatchId, waterBatch.getId())
-                .set(WaterTag::getHadShipment, StatusConstant.YES)
-                .set(StorageBaseEntity::getUpdateTime, new Date())
-                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
-        );
-
+        // 到货贴标
+        waterTagService.shipment(waterBatch.getId());
     }
 
     private String getCode(String contractCode) {

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBillServiceImpl.java

@@ -1,54 +0,0 @@
-package com.fjhx.service.water.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
-import com.fjhx.entity.water.WaterBill;
-import com.fjhx.params.water.WaterBillVo;
-import com.fjhx.mapper.water.WaterBillMapper;
-import com.fjhx.service.water.WaterBillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 出入库单 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-09-20
- */
-@Service
-public class WaterBillServiceImpl extends ServiceImpl<WaterBillMapper, WaterBill> implements WaterBillService {
-
-    @Override
-    public Page<WaterBill> getPage(Map<String, String> condition) {
-
-        QueryWrapper<WaterBill> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<WaterBill> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(WaterBillVo waterBillVo) {
-        save(waterBillVo);
-    }
-
-    @Override
-    public void edit(WaterBillVo waterBillVo) {
-        updateById(waterBillVo);
-    }
-
-    @Override
-    public void delete(WaterBillVo waterBillVo) {
-        removeById(waterBillVo.getId());
-    }
-
-}

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterTagServiceImpl.java

@@ -73,20 +73,16 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
 
         if (waterTag != null) {
             Integer number = waterTag.getNumber();
-
-            for (int integer = 0; integer < num; integer++) {
-                number++;
+            for (int i = 1; i <= num; i++) {
                 WaterTag waterTagTemp = createWaterTag(waterTag.getMaterialId(), quantity, waterTag.getPrice(),
-                        waterTag.getWaterBatchId(), waterTag.getWaterBatchCode(), number);
+                        waterTag.getWaterBatchId(), waterTag.getWaterBatchCode(), number + i);
                 waterTagList.add(waterTagTemp);
             }
-
         } else {
             WaterBatch waterBatch = waterBatchService.getById(waterBatchId);
             for (int i = 1; i <= num; i++) {
                 WaterTag waterTagTemp = createWaterTag(waterBatch.getMaterialId(), quantity, waterBatch.getPrice(),
                         waterBatch.getId(), waterBatch.getCode(), i);
-
                 waterTagList.add(waterTagTemp);
             }
         }
@@ -94,31 +90,11 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
     }
 
     @Override
-    public void printer(List<Long> tagIdList) {
-        update(Wrappers.<WaterTag>lambdaUpdate()
-                .in(StorageBaseEntity::getId, tagIdList)
-                .set(WaterTag::getHadPrinter, StatusConstant.YES)
-                .set(StorageBaseEntity::getUpdateTime, new Date())
-                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
-        );
-    }
-
-    @Override
-    public void bindingRfid(Long id, String rfidCode) {
-        update(Wrappers.<WaterTag>lambdaUpdate()
-                .eq(StorageBaseEntity::getId, id)
-                .set(WaterTag::getRfidCode, rfidCode)
-                .set(WaterTag::getLabelUserId, AuthUtil.getUserId())
-                .set(StorageBaseEntity::getUpdateTime, new Date())
-                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
-        );
-    }
-
-    @Override
     public void uploadTag(MultipartFile file, Long waterBatchId) {
 
         Assert.notEmpty(waterBatchId, "批次id不能为空");
 
+        // 解析excel文件中的数据
         List<BigDecimal> quantityList = getQuantityListByExcel(file);
 
         Assert.gtZero(quantityList.size(), "导入标签数量为空");
@@ -128,30 +104,66 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
         List<WaterTag> waterTagList = new ArrayList<>();
 
         if (waterTag != null) {
-            Integer number = waterTag.getNumber();
+            Integer number = waterTag.getNumber() + 1;
 
             for (BigDecimal quantity : quantityList) {
-                number++;
                 WaterTag waterTagTemp = createWaterTag(waterTag.getMaterialId(), quantity, waterTag.getPrice(),
                         waterTag.getWaterBatchId(), waterTag.getWaterBatchCode(), number);
+                number++;
                 waterTagList.add(waterTagTemp);
             }
 
         } else {
             WaterBatch waterBatch = waterBatchService.getById(waterBatchId);
-            for (int i = 1; i <= quantityList.size(); i++) {
-                WaterTag waterTagTemp = createWaterTag(waterBatch.getMaterialId(), quantityList.get(i), waterBatch.getPrice(),
-                        waterBatch.getId(), waterBatch.getCode(), i);
 
+            int number = 1;
+
+            for (BigDecimal quantity : quantityList) {
+                WaterTag waterTagTemp = createWaterTag(waterBatch.getMaterialId(), quantity, waterBatch.getPrice(),
+                        waterBatch.getId(), waterBatch.getCode(), number);
+                number++;
                 waterTagList.add(waterTagTemp);
             }
+
         }
         saveBatch(waterTagList);
     }
 
+    @Override
+    public void printer(List<Long> tagIdList) {
+        update(Wrappers.<WaterTag>lambdaUpdate()
+                .in(StorageBaseEntity::getId, tagIdList)
+                .set(WaterTag::getHadPrinter, StatusConstant.YES)
+                .set(StorageBaseEntity::getUpdateTime, new Date())
+                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
+        );
+    }
+
+    @Override
+    public void shipment(Long waterBatchId) {
+        update(Wrappers.<WaterTag>lambdaUpdate()
+                .eq(WaterTag::getWaterBatchId, waterBatchId)
+                .set(WaterTag::getHadShipment, StatusConstant.YES)
+                .set(WaterTag::getPurchaseProgress, PurchaseProgressEnum.SHIPMENT.getType())
+                .set(StorageBaseEntity::getUpdateTime, new Date())
+                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
+        );
+    }
+
+    @Override
+    public void bindingRfid(Long id, String rfidCode) {
+        update(Wrappers.<WaterTag>lambdaUpdate()
+                .eq(StorageBaseEntity::getId, id)
+                .set(WaterTag::getRfidCode, rfidCode)
+                .set(WaterTag::getPurchaseProgress, PurchaseProgressEnum.LABELING.getType())
+                .set(WaterTag::getLabelUserId, AuthUtil.getUserId())
+                .set(StorageBaseEntity::getUpdateTime, new Date())
+                .set(StorageBaseEntity::getUpdateUser, AuthUtil.getUserId())
+        );
+    }
 
     /**
-     * 解析文件中的数据
+     * 解析excel文件中的数据
      */
     private List<BigDecimal> getQuantityListByExcel(MultipartFile file) {
 
@@ -164,22 +176,18 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
             String filename = file.getOriginalFilename();
             assert filename != null;
 
-            // 判断excel的后缀，不同的后缀用不同的对象去解析
             if (filename.endsWith(".xls")) {
                 workbook = new XSSFWorkbook(inputStream);
-            }
-            // xlsx是高版本的Excel文件
-            if (filename.endsWith(".xlsx")) {
+            } else if (filename.endsWith(".xlsx")) {
                 workbook = new XSSFWorkbook(inputStream);
-            }
-            if (workbook == null) {
-                throw new Exception();
+            } else {
+                throw new ServiceException("文件格式错误");
             }
 
             // 取到excel 中的第一张工作表
             Sheet sheet = workbook.getSheetAt(0);
             if (sheet == null) {
-                throw new Exception();
+                throw new ServiceException("excel表格读取失败");
             }
 
             // 行
@@ -201,10 +209,10 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
                     Cell cell = row.getCell(column);
                     if (cell != null) {
                         cell.setCellType(CellType.STRING);
-                        BigDecimal bigDecimal = Convert.toBigDecimal(cell.getStringCellValue().trim());
-                        if (bigDecimal != null && bigDecimal.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal quantity = Convert.toBigDecimal(cell.getStringCellValue().trim());
+                        if (quantity != null && quantity.compareTo(BigDecimal.ZERO) > 0) {
                             // 获取数量
-                            quantityList.add(bigDecimal);
+                            quantityList.add(quantity);
                         }
                     }
                 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -177,8 +177,8 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         Map<String, List<StockBackDetails>> collect = list.stream().collect(Collectors.groupingBy(StockBackDetails::getMaterialId));
 
         // 通过物料id货物物料名称
-        Map<String, String> materialMap = materialService.listByIds(collect.keySet())
-                .stream().collect(Collectors.toMap(BasicEntity::getId, Material::getName));
+        Map<String, Material> materialMap = materialService.listByIds(collect.keySet())
+                .stream().collect(Collectors.toMap(BasicEntity::getId, item -> item));
 
         // 退仓面料信息
         List<CheckDetailsInfo> checkDetailsInfoList = new ArrayList<>();
@@ -186,7 +186,8 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         collect.forEach((k, v) -> {
             CheckDetailsInfo checkDetailsInfo = new CheckDetailsInfo();
             checkDetailsInfo.setMaterialId(k);
-            checkDetailsInfo.setMaterialName(materialMap.get(k));
+            checkDetailsInfo.setMaterialCode(materialMap.get(k).getCode());
+            checkDetailsInfo.setMaterialName(materialMap.get(k).getName());
             checkDetailsInfo.setStockBackDetailsList(v);
             checkDetailsInfoList.add(checkDetailsInfo);
         });