1

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

@@ -312,6 +312,11 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private PaymentManagement paymentManagement;
+    /**
+     *合同对象
+     */
+    @TableField(exist = false)
+    private ContractManagementInfo contractManagement;
     /**
      *仓库对象
      */

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

@@ -220,6 +220,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         WeighingManagement weighingManagement=new WeighingManagement();
         weighingManagement.setId(IdGenerator.generateUUID());
         weighingManagement.setRelationId(qualityInspectionManagement.getRelationId());
+        weighingManagement.setContractNo(qualityInspectionManagement.getContractNo());
+        weighingManagement.setOutType(qualityInspectionManagement.getOutType());
         weighingManagement.setNumber(qualityInspectionManagement.getQualityNo());
         weighingManagement.setCustomer(qualityInspectionManagement.getCustomerName());
         weighingManagement.setCustomerPhone(qualityInspectionManagement.getCustomerPhone());

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

@@ -930,6 +930,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
                         } else {
                             tranCarInfo.setSubmit("2");
+                            tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
+                            tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                         }
                         tranCarInfoService.updateById(tranCarInfo);
                     }

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

@@ -91,6 +91,12 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                 if (commonCompany != null) {
                     weighingManagement1.setCompName(commonCompany.getCompName());
                 }
+                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("comp_id",weighingManagement1.getCompId())
+                        .eq("contract_no",weighingManagement1.getContractNo()));
+                if (contractManagementInfo!=null){
+                    weighingManagement1.setContractManagement(contractManagementInfo);
+                }
                 PaymentManagement paymentManagement = paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
                         .eq("relation_id", weighingManagement1.getRelationId())
                         .eq("comp_id", weighingManagement1.getCompId()));

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

@@ -45,6 +45,7 @@
         q.relation_id as relationId,
         q.quality_inspector as qualityInspector,
         q.re_buckle_miscellaneous as reBuckleMiscellaneous,
+        q.service_management_type as serviceManagementType,
         q.buckle_miscellaneous as buckleMiscellaneous,
         q.re_inspector as reInspector,
         q.car_number as carNumber,

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

@@ -51,12 +51,14 @@
         a.number,
         a.customer,
         a.customer_number_card as customerNumberCard,
+        a.service_management_type as serviceManagementType,
         a.customer_phone as customerPhone,
         w.person_charge as person,
         w.person_phone as personPhone,
         w.id as warehouseId,
         a.type,
         a.contract_no as contractNo,
+        a.out_type as outType,
         a.car_number as carNumber,
         a.relation_id as relationId,
         a.goods_name as goodsName,