更新

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

@@ -131,6 +131,10 @@ public class ExportVView {
      * 发货库
      */
     private String sendWarehouse;
+    /**
+     * 收货库
+     */
+    private String receiveWarehouse;
     /**
      * 运输单价
      */

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

@@ -374,7 +374,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehouseInOutDetail.setMildewGrain(qualityInspectionManagement.getMildewGrain());
             warehouseInOutDetail.setJiaorenli(qualityInspectionManagement.getJiaorenli());
             warehouseInOutDetail.setImperfectGrain(qualityInspectionManagement.getImperfectGrain());
-            warehouseInOutDetailService.insert(warehouseInOutDetail);
+            List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+            if(ll.size() == 0){
+                warehouseInOutDetailService.insert(warehouseInOutDetail);
+            }
             WeightedDetails weightedDetails = new WeightedDetails();
             weightedDetails.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
             weightedDetails.setId(IdGenerator.generateUUID());
@@ -526,7 +529,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             warehouseInOutDetail.setMildewGrain(qualityInspectionManagement.getMildewGrain());
             warehouseInOutDetail.setJiaorenli(qualityInspectionManagement.getJiaorenli());
             warehouseInOutDetail.setImperfectGrain(qualityInspectionManagement.getImperfectGrain());
-            warehouseInOutDetailService.insert(warehouseInOutDetail);
+            List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+            if(ll.size() == 0){
+                warehouseInOutDetailService.insert(warehouseInOutDetail);
+            }
             WeightedDetails weightedDetails = new WeightedDetails();
             weightedDetails.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
             weightedDetails.setId(IdGenerator.generateUUID());

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

@@ -225,7 +225,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 // 详情
                 warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
                 warehouseInOutDetail.setId(IdGenerator.generateUUID());
-                warehouseInOutDetailService.insert(warehouseInOutDetail);
+                List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+                if(ll.size() == 0){
+                    warehouseInOutDetailService.insert(warehouseInOutDetail);
+                }
             }
             // 编辑修改记录
             else {
@@ -235,7 +238,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     // 详情
                     warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
                     warehouseInOutDetail.setId(IdGenerator.generateUUID());
-                    warehouseInOutDetailService.insert(warehouseInOutDetail);
+                    List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+                    if(ll.size() == 0){
+                        warehouseInOutDetailService.insert(warehouseInOutDetail);
+                    }
                 } else {
                     warehouseInOutDetailService.updateById(warehouseInOutDetail);
                 }
@@ -319,7 +325,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 // 详情
                 warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
                 warehouseInOutDetail.setId(IdGenerator.generateUUID());
-                warehouseInOutDetailService.insert(warehouseInOutDetail);
+                List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+                if(ll.size() == 0){
+                    warehouseInOutDetailService.insert(warehouseInOutDetail);
+                }
 
             }
             // 编辑修改记录
@@ -594,7 +603,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         // 插入详情
                         warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
                         warehouseInOutDetail.setId(IdGenerator.generateUUID());
-                        warehouseInOutDetailService.insert(warehouseInOutDetail);
+                        List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+                        if(ll.size() == 0){
+                            warehouseInOutDetailService.insert(warehouseInOutDetail);
+                        }
                     }
                     //更新库存量
                     //判断是否有货
@@ -2048,7 +2060,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 warehouseInOutDetail.setId(IdGenerator.generateUUID());
                 warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
                 // 操作详情数据库
-                warehouseInOutDetailService.insert(warehouseInOutDetail);
+                List<WarehouseInOutDetail> ll = warehouseInOutDetailService.selectList(new EntityWrapper<WarehouseInOutDetail>().eq("info_id",warehouseInOutInfo.getId()));
+                if(ll.size() == 0){
+                    warehouseInOutDetailService.insert(warehouseInOutDetail);
+                }
             }
 
             // 操作主表数据

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

@@ -354,11 +354,13 @@
         '' as collectionDate,
         '' as money,
         '' as status,
-        w.net_weight as netWeight
+        w.net_weight as netWeight,
+        tti.receive_warehouse as receiveWarehouse
         FROM warehouse_in_out_info w
         left join warehouse_in_out_detail d on w.id=d.info_id and d.delete_flag = 0
         left join tran_car_info t on t.contract_no = w.contract_no and t.delete_flag = 0 and t.tran_car_no =
         w.tran_car_no and t.car_no = w.car_no
+        left join tran_task_info tti on tti.id = t.info_id and tti.delete_flag = 0
         left join warehouse_base_info b on b.id=w.base_id and b.delete_flag = 0
         left join contract_management_info m on m.comp_id = b.comp_id and m.contract_no = w.warehouse_name and
         m.delete_flag = 0
@@ -424,7 +426,8 @@
         s.collection_date as collectionDate,
         '' as money,
         s.status as status,
-        s.net_weight as netWeight
+        s.net_weight as netWeight,
+        t.receive_warehouse as receiveWarehouse
         FROM stock_sale_receipt_report s
         left join warehouse_in_out_info w on w.id = s.warehouse_record_id and w.delete_flag = 0
         left join tran_process_info p on p.id = s.process_id and p.delete_flag = 0