更新

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

@@ -149,8 +149,8 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     /**
      * 入库日期(出库)
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date inOutDate;
     /**
      * 出入库类型key

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

@@ -248,6 +248,12 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             weighingManagement.setCustomerNumberCard(qualityInspectionManagement.getCustomerNumberCard());
             weighingManagementService.updateById(weighingManagement);
         }
+        WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectById(qualityInspectionManagement.getWarehouseInOutId());
+        if(warehouseInOutInfo != null){
+            warehouseInOutInfo.setPositionId(qualityInspectionManagement.getPositionId());
+            warehouseInOutInfo.setBinNo(qualityInspectionManagement.getBinNumber());
+            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+        }
         //成功返回ok
         if (one ) {
             return "OK";

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

@@ -344,6 +344,7 @@
         0 as feedbackWeight,
         w.in_out_date as feedbackDate,
         w.net_weight as settlementWeight,
+        0 as settlementPrice,
         IFNULL(t.tran_price,0) as carFreight,
         '' as trainFreight,
         '' as shipFreight,
@@ -416,6 +417,7 @@
         s.feedback_weight as feedbackWeight,
         s.feedback_date as feedbackDate,
         s.settlement_weight as settlementWeight,
+        s.settlement_price as settlementPrice,
         case when p.tran_type_key = '1' then p.actual_freight else '' end as carFreight,
         case when p.tran_type_key = '2' then p.actual_freight else '' end as trainFreight,
         case when p.tran_type_key = '3' then p.actual_freight else '' end as shipFreight,