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/QualityInspectionManagement.java

@@ -241,6 +241,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String flag;
+    /**
+     *检斤对象
+     */
+    @TableField(exist = false)
+    private WeighingManagement weighingManagement;
 
     @Override
     protected Serializable pkVal() {

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

@@ -68,6 +68,13 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<QualityInspectionManagement> dataList = baseMapper.getListByCondition(pageView);
+        for (QualityInspectionManagement qualityInspectionManagement1:dataList) {
+            WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                    .eq("relation_id", qualityInspectionManagement1.getRelationId()));
+            if (weighingManagement != null) {
+                qualityInspectionManagement1.setWeighingManagement(weighingManagement);
+            }
+        }
         Page<QualityInspectionManagement> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);

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

@@ -741,6 +741,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         stockSaleReceiptReport.setTare(warehouseInOutInfo.getTare());
                         stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
                         stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
+                        stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight()*Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                         stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
                         stockSaleReceiptReport.setReturnFlag("1");
                         stockSaleReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());

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

@@ -127,8 +127,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 .eq("relation_id", weighingManagement.getRelationId()));
         if (qualityInspectionManagement!=null){
             //状态改为已称毛重
-            qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
-            qualityInspectionManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
+//            qualityInspectionManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
+//            qualityInspectionManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
             qualityInspectionManagementService.updateById(qualityInspectionManagement);
         }
         if ("3".equals(weighingManagement.getManagementType())){
@@ -193,8 +193,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 .eq("relation_id", weighingManagement1.getRelationId()));
         if (qualityInspectionManagement1!=null){
             //状态改为已称皮重
-            qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
-            qualityInspectionManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
+//            qualityInspectionManagement1.setStatus(StatusEnum.TARED.getName());
+//            qualityInspectionManagement1.setStatusFlag(StatusEnum.TARED.getFlag());
             qualityInspectionManagementService.updateById(qualityInspectionManagement1);
         }
         //收购业务

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

@@ -30,6 +30,7 @@
         q.quality_no as qualityNo,
         q.contract_no as contractNo,
         q.customer_name as customerName,
+        q.relation_id as relationId,
         q.quality_inspector as qualityInspector,
         q.re_buckle_miscellaneous as reBuckleMiscellaneous,
         q.re_inspector as reInspector,