销售合同字段修改

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/po/SalesContract.java

@@ -124,4 +124,23 @@ public class SalesContract extends BasePo {
      */
     private String buyAddress;
 
+
+    /**
+     * 卖方收款人
+     */
+    private String sellAccountName;
+    /**
+     * 卖方银行
+     */
+    private String sellOpeningBank;
+    /**
+     * 卖方行联号
+     */
+    private String sellInterbankNumber;
+    /**
+     * 卖方账号
+     */
+    private String sellAccountOpening;
+
+
 }

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java

@@ -70,17 +70,5 @@ public class SalesContractVo extends SalesContract {
      * 卖方税号
      */
     private String sellTaxationCode;
-    /**
-     * 卖方开户银行
-     */
-    private String sellOpeningBank;
-    /**
-     * 卖方行联号
-     */
-    private String sellSwiftCode;
-    /**
-     * 卖方账号
-     */
-    private String sellAccountOpening;
 
 }

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -125,8 +125,10 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
         result.setSellCorporationName(corporation.getName());
         result.setSellCorporationNumber(corporation.getCorporationNumber());
         result.setSellTaxationCode(corporation.getTaxationCode());
+
+        result.setSellAccountName(accountManagement.getName());
         result.setSellOpeningBank(accountManagement.getOpeningBank());
-        result.setSellSwiftCode(accountManagement.getSwiftCode());
+        result.setSellInterbankNumber(accountManagement.getInterbankNumber());
         result.setSellAccountOpening(accountManagement.getAccountOpening());
 
         return result;

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -263,6 +263,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         stockWait.setBusinessCode(productionTaskDetail.getProductSn());//产品sn
         stockWaitService.save(stockWait);
         StockWaitDetails stockWaitDetails = new StockWaitDetails();
+        stockWaitDetails.setBusinessDetailsId(productionTaskDetail.getId());
         stockWaitDetails.setStockWaitId(stockWait.getId());
         stockWaitDetails.setProductId(productionTaskDetail.getProductId());
         stockWaitDetails.setQuantity(BigDecimal.ONE);//生产任务明细入库 数量默认只有1

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitDetailsServiceImpl.java

@@ -95,6 +95,7 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
             throw new ServiceException("无法查询到产品信息,产品id" + StockWaitDetails.getProductId());
         }
         result.setProductName(byId.getName());
+        result.setBusinessId(stockWait.getBusinessId());
         return result;
     }