修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WeighingManagementController.java

@@ -51,6 +51,25 @@ public class WeighingManagementController {
     public String editTare(@RequestBody WeighingManagement weighingManagement){
         return weighingManagementService.editTare(weighingManagement);
     }
+
+    /**
+     * 出库管理添加皮重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @PostMapping("/api/addTare")
+    public String addTare(@RequestBody WeighingManagement weighingManagement){
+        return weighingManagementService.addTare(weighingManagement);
+    }
+    /**
+     * 出库管理编辑皮重检斤
+     * @param weighingManagement
+     * @return
+     */
+    @PostMapping("/api/editTareOut")
+    public String editTareOut(@RequestBody WeighingManagement weighingManagement){
+        return weighingManagementService.editTareOut(weighingManagement);
+    }
     /**
      * 删除检斤管理信息
      * @param weighingManagement

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PaymentManagement.java

@@ -59,6 +59,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 编号
      */
     private String paymentNo;
+    /**
+     * 合同编号
+     */
+    private String contractNo;
     /**
      * 客户
      */
@@ -83,6 +87,18 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 净重（公斤）
      */
     private Float netWeight;
+    /**
+     * 毛重（公斤）
+     */
+    private Float grossWeight;
+    /**
+     * 皮重（公斤）
+     */
+    private Float tare;
+    /**
+     * 管理类型
+     */
+    private String managementType;
     /**
      * 纯重（公斤）
      */
@@ -95,6 +111,10 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 已付金额（元/吨）
      */
     private Float amountEdPayable;
+    /**
+     * 已收金额（元/吨）
+     */
+    private Float amountEdCollectionable;
     /**
      * 未付金额
      */
@@ -103,12 +123,22 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 付款截图
      */
     private String paymentScreenshot;
+    /**
+     * 收款截图
+     */
+    private String collectionScreenshot;
     /**
      * 付款日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date paymentDate;
+    /**
+     * 收款日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date collectionDate;
     /**
      * 扣重比
      */
@@ -161,10 +191,18 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
      * 计算应付
      */
     private Float calculationPayable;
+    /**
+     * 计算应收
+     */
+    private Float calculationCollectionable;
     /**
      * 实际付款
      */
     private Float actualPayment;
+    /**
+     * 实际收款
+     */
+    private Float actualCollectionment;
     /**
      * 人民币大写
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -114,6 +114,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 仓位编号
      */
     private String binNumber;
+    /**
+     * 管理类型
+     */
+    private String managementType;
     /**
      * 囤位编号
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -1,13 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -110,6 +108,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 仓位号
      */
     private String binNumber;
+    /**
+     * 出库类型
+     */
+    private String inOutType;
     /**
      * 囤位号
      */
@@ -152,6 +154,10 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      * 霉变粒
      */
     private String mildewGrain;
+    /**
+     * 管理类型
+     */
+    private String managementType;
     /**
      * 不完善粒
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWeighingManagementService.java

@@ -30,6 +30,16 @@ public interface IWeighingManagementService extends IService<WeighingManagement>
      * @param weighingManagement
      */
     String editTare(WeighingManagement weighingManagement);
+    /**
+     * 出库管理添加皮重检斤
+     * @param weighingManagement
+     */
+    String addTare(WeighingManagement weighingManagement);
+    /**
+     * 出库管理编辑皮重检斤
+     * @param weighingManagement
+     */
+    String editTareOut(WeighingManagement weighingManagement);
     /**
      * 删除检斤管理信息
      * @param id

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -52,6 +52,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     private ISaleOrderService saleOrderService;
     @Autowired
     private IPurchasePriceService purchasePriceService;
+    @Autowired
+    private IContractGoodsInfoService contractGoodsInfoService;
 
     /**
      * 仓库管理页面列表
@@ -591,6 +593,9 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .orderBy("update_date", false));
 
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
+                ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                .eq("contract_id",contractManagementInfo.getId()));
+                contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 temp.add(contractManagementInfo);
             }
             return temp;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -232,4 +232,59 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         return weighingManagement;
     }
 
+    /**
+     * 出库管理添加皮重检斤管理信息
+     * @param weighingManagement
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addTare(WeighingManagement weighingManagement) {
+        String relationId=IdGenerator.generateUUID();
+        weighingManagement.setId(IdGenerator.generateUUID());
+        weighingManagement.setRelationId(relationId);
+        //生成质检信息
+        QualityInspectionManagement qualityInspectionManagement = new QualityInspectionManagement();
+        qualityInspectionManagement.setId(IdGenerator.generateUUID());
+        qualityInspectionManagement.setRelationId(relationId);
+        qualityInspectionManagement.setContractNo(weighingManagement.getContractNo());
+        qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
+        qualityInspectionManagement.setCompId(weighingManagement.getCompId());
+        qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());
+        qualityInspectionManagement.setBinNumber(weighingManagement.getBinNumber());
+        qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
+        qualityInspectionManagement.setStorageTagNo(weighingManagement.getStorageNumber());
+        boolean two=qualityInspectionManagementService.insert(qualityInspectionManagement);
+        boolean one=this.insert(weighingManagement);
+        //成功返回ok
+        if (one &&two ) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
+    /**
+     * 出库管理编辑皮重检斤管理信息
+     * @param weighingManagement
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editTareOut(WeighingManagement weighingManagement) {
+        //状态改为已称皮重
+        weighingManagement.setStatus(StatusEnum.TARED.getName());
+        weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+        //更新检斤信息
+        boolean one = this.updateById(weighingManagement);
+        //更新质检信息
+        boolean two = qualityInspectionManagementService.updateById(weighingManagement.getQualityInspectionManagement());
+        //成功返回ok
+        if (one &&two ) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -31,6 +31,7 @@
         goods_name as goodsName,
         gross_weight as grossWeight,
         tare,
+        in_out_type as inOutType,
         bin_number as binNumber,
         storage_number as storageNumber,
         secretary_weigher as secretaryWeigher,