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

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

@@ -93,6 +93,15 @@ public class QualityInspectionManagementController {
     public Integer settledCount(QualityInspectionManagement qualityInspectionManagement){
         return qualityInspectionManagementService.settledCount(qualityInspectionManagement);
     }
+    /**
+     * 导入
+     *  @param qualityInspectionManagement
+     * @return
+     */
+    @PostMapping("/api/importQuality")
+    public String importQuality(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
+        return qualityInspectionManagementService.importQuality(qualityInspectionManagement);
+    }
 
 }
 

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

@@ -391,11 +391,31 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String qualityType;
+    /**
+     * 毛重（公斤）
+     */
+    @TableField(exist = false)
+    private Float grossWeight;
+    /**
+     * 皮重（公斤）
+     */
+    @TableField(exist = false)
+    private Float tare;
+    /**
+     * 净重（公斤）
+     */
+    @TableField(exist = false)
+    private Float netWeight;
     /**
      *合同对象
      */
     @TableField(exist = false)
     private ContractManagementInfo contractManagement;
+    /**
+     *导入
+     */
+    @TableField(exist = false)
+    private List<QualityInspectionManagement> qualityInspectionManagementList;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -58,4 +58,9 @@ public interface IQualityInspectionManagementService extends IService<QualityIns
      * @param qualityInspectionManagement
      */
     Integer settledCount(QualityInspectionManagement qualityInspectionManagement);
+    /**
+     * 导入
+     * @param qualityInspectionManagement
+     */
+    String importQuality(QualityInspectionManagement qualityInspectionManagement);
 }

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

@@ -366,4 +366,79 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 .eq("status_flag","1"));
         return count;
     }
+
+    @Override
+    public String importQuality(QualityInspectionManagement qualityInspectionManagement) {
+        List<QualityInspectionManagement> qualityInspectionManagementList=qualityInspectionManagement.getQualityInspectionManagementList();
+        for (QualityInspectionManagement qualityInspectionManagement1:qualityInspectionManagementList) {
+            String relationId = IdGenerator.generateUUID();
+            qualityInspectionManagement1.setId(IdGenerator.generateUUID());
+            qualityInspectionManagement1.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+            qualityInspectionManagement1.setRelationId(relationId);
+            qualityInspectionManagement1.setGoodsName("玉米");
+            qualityInspectionManagement1.setNatureOfGrainPurchase("贸易粮");
+            qualityInspectionManagement1.setServiceManagementType("3");
+            qualityInspectionManagement1.setQualityNo(qualityInspectionManagement1.getQualityNo());
+            qualityInspectionManagement1.setCustomerName(qualityInspectionManagement1.getCustomerName());
+            qualityInspectionManagement1.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            qualityInspectionManagement1.setCarNumber(qualityInspectionManagement1.getCarNumber());
+            qualityInspectionManagement1.setWarehouseName(qualityInspectionManagement.getWarehouseName());
+            qualityInspectionManagement1.setDryGrainPrice(qualityInspectionManagement1.getDryGrainPrice());
+            qualityInspectionManagement1.setQualityDate(qualityInspectionManagement1.getQualityDate());
+            qualityInspectionManagement1.setManagementType("1");
+            CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+            qualityInspectionManagement1.setQualityInspector(commonStaff.getStaffName());
+            //状态为已复检
+            qualityInspectionManagement1.setStatus(StatusEnum.COMPLEX_INSPECTED.getName());
+            qualityInspectionManagement1.setStatusFlag(StatusEnum.COMPLEX_INSPECTED.getFlag());
+            qualityInspectionManagement1.setAgentKey(AuthSecurityUtils.getCurrentUserId());
+            qualityInspectionManagement1.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+            //生成检斤信息
+            WeighingManagement weighingManagement = new WeighingManagement();
+            weighingManagement.setId(IdGenerator.generateUUID());
+            weighingManagement.setRelationId(relationId);
+            weighingManagement.setNumber(qualityInspectionManagement1.getQualityNo());
+            weighingManagement.setCustomer(qualityInspectionManagement1.getCustomerName());
+            weighingManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            weighingManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
+            weighingManagement.setCarNumber(qualityInspectionManagement1.getCarNumber());
+            weighingManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+            weighingManagement.setServiceManagementType("3");
+            weighingManagement.setGoodsName("玉米");
+            weighingManagement.setGrossWeight(qualityInspectionManagement1.getGrossWeight());
+            weighingManagement.setTare(qualityInspectionManagement1.getTare());
+            weighingManagement.setNetWeight(qualityInspectionManagement1.getNetWeight());
+            weighingManagement.setManagementType("1");
+            weighingManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
+            weighingManagement.setGrossDate(qualityInspectionManagement1.getQualityDate());
+            weighingManagement.setTareDate(qualityInspectionManagement1.getQualityDate());
+            //状态为已称皮重
+            weighingManagement.setStatus(StatusEnum.TARED.getName());
+            weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
+            PaymentManagement paymentManagement=new PaymentManagement();
+            paymentManagement.setId(IdGenerator.generateUUID());
+            paymentManagement.setRelationId(relationId);
+            paymentManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+            paymentManagement.setCustomerNumberCard(qualityInspectionManagement1.getCustomerNumberCard());
+            paymentManagement.setPaymentNo(qualityInspectionManagement1.getQualityNo());
+            paymentManagement.setCustomerName(qualityInspectionManagement1.getCustomerName());
+            paymentManagement.setCustomerPhone(qualityInspectionManagement1.getCustomerPhone());
+            paymentManagement.setCarNo(qualityInspectionManagement1.getCarNumber());
+            paymentManagement.setGoodsName("玉米");
+            paymentManagement.setStatus(StatusEnum.PURCHASE_COMPLETED.getName());
+            paymentManagement.setStatusFlag(StatusEnum.PURCHASE_COMPLETED.getFlag());
+            paymentManagement.setNetWeight(qualityInspectionManagement1.getNetWeight());
+            paymentManagement.setManagementType("1");
+            paymentManagement.setGrossWeight(qualityInspectionManagement1.getGrossWeight());
+            paymentManagement.setTare(weighingManagement.getTare());
+            paymentManagement.setSettlementDate(qualityInspectionManagement1.getQualityDate());
+            paymentManagement.setWarehouseName(qualityInspectionManagement.getWarehouseName());
+            paymentManagement.setAmountIngPayable(Double.valueOf(String.valueOf(qualityInspectionManagement1.getNetWeight()*qualityInspectionManagement1.getDryGrainPrice())));
+            paymentManagement.setAmountNotPayable(Double.valueOf(String.valueOf(qualityInspectionManagement1.getNetWeight()*qualityInspectionManagement1.getDryGrainPrice())));
+            paymentManagementService.insert(paymentManagement);
+            this.insert(qualityInspectionManagement1);
+            weighingManagementService.insert(weighingManagement);
+        }
+        return "ok";
+    }
 }