Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -118,7 +118,9 @@ public enum StatusEnum {
     PURCHASE_FAILED("4", "已驳回", "failed"),
 
     //质检检斤管理状态
+    FIRST_INSPECTED("0", "已初检", "first inspected"),
     INSPECTED("1", "已质检", "inspected"),
+    COMPLEX_INSPECTED("2", "已复检", "complex inspected"),
     WEIGHED_GROSS_WEIGHT("3", "已称毛重", "weighedgrossweight"),
     TARED("5", "已称皮重", "tared"),
 

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

@@ -75,6 +75,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 质检员
      */
     private String qualityInspector;
+    /**
+     * 复检员
+     */
+    private String reInspector;
     /**
      * 车牌号
      */
@@ -107,6 +111,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 扣重比
      */
     private Float buckleWeightRatio;
+    /**
+     * 复检扣杂
+     */
+    private Float reBuckleMiscellaneous;
     /**
      * 货名key
      */
@@ -115,6 +123,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 图片地址
      */
     private String pictureAddress;
+    /**
+     * 是否确认(1已确认)
+     */
+    private String confirm;
     /**
      * 货名
      */
@@ -161,6 +173,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 水分
      */
     private String waterContent;
+    /**
+     * 复检水分
+     */
+    private String reWaterContent;
     /**
      * 杂质
      */
@@ -220,12 +236,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 干粮水分
      */
     private Float waterMin;
-
-    @TableField(exist = false)
     /**
-     * 干粮水分
+     * flag 1复检2确认
      */
-    private List<PurchasePrice> purchasePriceList;
+    @TableField(exist = false)
+    private String flag;
 
     @Override
     protected Serializable pkVal() {

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

@@ -133,9 +133,18 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      */
     @Override
     public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
-        qualityInspectionManagement.setQualityDate(new Date());
         CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
-        qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
+        //复检
+        if ("1".equals(qualityInspectionManagement.getFlag())){
+            qualityInspectionManagement.setReInspector(commonStaff.getStaffName());
+            //状态为已复检
+            qualityInspectionManagement.setStatus(StatusEnum.COMPLEX_INSPECTED.getName());
+            qualityInspectionManagement.setStatusFlag(StatusEnum.COMPLEX_INSPECTED.getFlag());
+        }
+        //确认
+        else if ("2".equals(qualityInspectionManagement.getFlag())){
+            qualityInspectionManagement.setConfirm("1");
+        }
         boolean one=this.updateById(qualityInspectionManagement);
         //成功返回ok
         if (one ) {
@@ -176,9 +185,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         qualityInspectionManagement.setQualityDate(new Date());
         CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
         qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
-        //状态为已质检
-        qualityInspectionManagement.setStatus(StatusEnum.INSPECTED.getName());
-        qualityInspectionManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());
+        //状态为已初检
+        qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
+        qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
         //生成检斤信息
         WeighingManagement weighingManagement=new WeighingManagement();
         weighingManagement.setId(IdGenerator.generateUUID());

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

@@ -200,7 +200,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String InOutWarehouse(WarehouseInOutInfo warehouseInOutInfo) {
-
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        warehouseInOutInfo.setBackOffice(commonStaff.getStaffName());
         WarehouseInOutDetail warehouseInOutDetail = warehouseInOutInfo.getWarehouseInOutDetail();
         // 查询仓库
         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(warehouseInOutInfo.getBaseId());

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

@@ -31,9 +31,12 @@
         q.contract_no as contractNo,
         q.customer_name as customerName,
         q.quality_inspector as qualityInspector,
+        q.re_buckle_miscellaneous as reBuckleMiscellaneous,
+        q.re_inspector as reInspector,
         q.car_number as carNumber,
         q.management_type as managementType,
         q.goods_name as goodsName,
+        q.confirm,
         q.grade,
         q.imperfect_grain as imperfectGrain,
         q.jiaorenli,
@@ -41,6 +44,7 @@
         q.mildew_grain as mildewGrain,
         q.tidal_grain_price as tidalGrainPrice,
         q.water_content as waterContent,
+        q.re_water_content as reWaterContent,
         q.bin_number as binNumber,
         q.bulk_density as bulkDensity,
         q.storage_tag_no as storageTagNo,