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

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

@@ -64,6 +64,15 @@ public class ReleaseView {
      */
     private String showFlag;
 
+    /**
+     * 基差（元/吨）
+     */
+    private String basisPrice;
+    /**
+     * 类型
+     */
+    private String planType;
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date updateDate;

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

@@ -127,8 +127,14 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
     public String insertProcurementPlanInfo(ProcurementPlanInfo procurementPlanInfo) {
         //新增主键id
         procurementPlanInfo.setId(IdGenerator.generateUUID());
-        procurementPlanInfo.setStatus(StatusEnum.ORDER_REVIEWED.getName());
-        procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_REVIEWED.getFlag());
+        if("1".equals(procurementPlanInfo.getPcFlag())){
+            procurementPlanInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
+            procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+        }
+        else {
+            procurementPlanInfo.setStatus(StatusEnum.ORDER_REVIEWED.getName());
+            procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_REVIEWED.getFlag());
+        }
         procurementPlanInfo.setShowFlag(StatusEnum.PURCHASE_SHOW.getFlag());
         // 操作主表数据
         this.insert(procurementPlanInfo);

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

@@ -437,7 +437,7 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
         // 添加客户信息
         int count = customerInfoService.selectCount(new EntityWrapper<CustomerInfo>().eq("customer_phone", saleOrder.getBuyerPhone())
                 .eq("delete_flag", "0"));
-        if (count > 0) {
+        if (count == 0) {
             CustomerInfo customerInfo = new CustomerInfo();
             customerInfo.setCustomerName(saleOrder.getBuyer());
             customerInfo.setCustomerPhone(saleOrder.getBuyerPhone());

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

@@ -117,8 +117,14 @@ public class SalePlanInfoServiceImpl extends ServiceImpl<SalePlanInfoMapper, Sal
     public String insertSalePlanInfo(SalePlanInfo salePlanInfo) {
         //新增主键id
         salePlanInfo.setId(IdGenerator.generateUUID());
-        salePlanInfo.setStatus(StatusEnum.ORDER_REVIEWED.getName());
-        salePlanInfo.setStatusFlag(StatusEnum.ORDER_REVIEWED.getFlag());
+        if("1".equals(salePlanInfo.getPcFlag())){
+            salePlanInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
+            salePlanInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+        }
+        else {
+            salePlanInfo.setStatus(StatusEnum.ORDER_REVIEWED.getName());
+            salePlanInfo.setStatusFlag(StatusEnum.ORDER_REVIEWED.getFlag());
+        }
         salePlanInfo.setShowFlag(StatusEnum.PURCHASE_SHOW.getFlag());
         // 操作主表数据
         this.insert(salePlanInfo);

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

@@ -421,6 +421,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     TranCarInfo tranCarInfo=new TranCarInfo();
                     tranCarInfo.setId(IdGenerator.generateUUID());
                     tranCarInfo.setCarNo(warehouseInOutInfo.getCarNo());
+                    tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                     tranCarInfo.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                     tranCarInfo.setLoadNetWeight(warehouseInOutInfo.getNetWeight());
                     tranCarInfo.setLoadPoundImg(warehouseInOutInfo.getAddressUrl());

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

@@ -109,10 +109,12 @@
         procurement_price as unitPrice,
         receive_private as Privates,
         planned_purchase_volume as plannedVolume,
+        procurement_plan_type as planType,
         receive_city as city,
         receive_area as area,
         show_flag as showFlag,
         receive_warehouse as warehouse,
+        basis_price as basisPrice,
         status as status,
         update_date as updateDate,
         status_flag as statusFlag
@@ -128,10 +130,12 @@
         sale_price as unitPrice,
         send_private as Privates,
         planned_sale_volume as plannedVolume,
+        sale_plan_type as planType,
         send_city as city,
         send_area as area,
         show_flag as showFlag,
         send_warehouse as warehouse,
+        basis_price as basisPrice,
         status as status,
         update_date as updateDate,
         status_flag as statusFlag