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

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

@@ -1453,7 +1453,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         //净重合计
         cell = rowp.createCell(27);
         cell.setCellValue(netWeightTotal);
-        cell.setCellStyle(styleDetail1);
+        cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(28);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(29);
@@ -1462,7 +1462,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(31);
         cell.setCellValue(amountIngPayableTotal);
-        cell.setCellStyle(styleDetail1);
+        cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(32);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(33);
@@ -1688,7 +1688,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(27);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
-                cell.setCellStyle(styleDetail);
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(28);
                 cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
@@ -2208,7 +2208,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         //净重合计
         cell = rowp.createCell(27);
         cell.setCellValue(netWeightTotal);
-        cell.setCellStyle(styleDetail1);
+        cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(28);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(29);
@@ -2217,7 +2217,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(31);
         cell.setCellValue(amountIngPayableTotal);
-        cell.setCellStyle(styleDetail1);
+        cell.setCellStyle(contextstyle1);
         cell = rowp.createCell(32);
         cell.setCellStyle(styleDetail);
         cell = rowp.createCell(33);
@@ -2446,7 +2446,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(27);
                 cell.setCellValue(editFloat(paymentManagement1.getNetWeight()));
-                cell.setCellStyle(styleDetail);
+                cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(28);
                 cell.setCellValue(editDouble(paymentManagement1.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);

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

@@ -644,12 +644,12 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             if(qualityInspectionManagement1.getMoney() != null){
                 money = qualityInspectionManagement1.getMoney();
             }
+
             paymentManagement.setAmountIngPayable(money);
             paymentManagement.setAmountEdPayable(money);
             paymentManagement.setGrainMoney(Float.valueOf(String.valueOf(money)));
             paymentManagement.setCalculationPayable(money);
             paymentManagement.setActualPayment(money);
-
             paymentManagement.setSettlementClerk(commonStaff.getStaffName());
             paymentManagementService.insert(paymentManagement);
             this.insert(qualityInspectionManagement1);

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

@@ -4826,7 +4826,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 //                        if ("1".equals(tranCarInfo.getSubmit())) {
 //                            throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
 //                        } else {
-//                            tranCarInfo.setSubmit("1");
+                        tranCarInfo.setSubmit("1");
 //                        }
                         tranCarInfoService.updateById(tranCarInfo);
                     }