瀏覽代碼

重要:BO_EU_DNCTT_CONTRACT_COST_PRODUCT的BINDID不等于BO_EU_DNCTT_CONTRACT_COST的BINDID。

zhangyao 4 月之前
父節點
當前提交
b7c0fec2d0

二進制
com.awspaas.user.apps.donenow_ctt/lib/com.awspaas.user.apps.donenow_ctt.jar


+ 1 - 1
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/at/getPickSNListSql.java

@@ -34,7 +34,7 @@ public class getPickSNListSql extends AbstExpression {
 
 
         //已被拣货数量
-        List<RowMap> pickList = DBSql.getMaps("SELECT a.* from BO_EU_DNCTT_CONTRACT_COST_PRODUCT a JOIN BO_EU_DNCTT_CONTRACT_COST b ON a.BINDID=b.BINDID WHERE a.WAREHOUSE_ID=? AND b.PRODUCT_ID=?", new Object[]{stockMap.getString("WAREHOUSE_ID"), stockMap.getString("PRODUCT_ID")});
+        List<RowMap> pickList = DBSql.getMaps("SELECT a.* from BO_EU_DNCTT_CONTRACT_COST_PRODUCT a JOIN BO_EU_DNCTT_CONTRACT_COST b ON a.CONTRACT_COST_ID=b.ID WHERE a.WAREHOUSE_ID=? AND b.PRODUCT_ID=?", new Object[]{stockMap.getString("WAREHOUSE_ID"), stockMap.getString("PRODUCT_ID")});
         List<String> selectedSns = new ArrayList<>();//默认选择
         for (RowMap lotMap : lotList) {
             String lotSNs = lotMap.getString("SN");

+ 5 - 2
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/controller/contractCostController.java

@@ -200,7 +200,7 @@ public class contractCostController {
         //库存产品
         List<RowMap> lotList = DBSql.getMaps("SELECT b.* FROM bo_eu_dnivt_warehouse_product a JOIN BO_EU_DNIVT_WAREHOUSE_PRODUCT_LOT b ON a.BINDID=b.BINDID WHERE b.QUANTITY>0 AND a.ID=? ORDER BY b.IN_DATE", new Object[]{warehouseProductId});
         //已被拣货数量
-        List<RowMap> pickList = DBSql.getMaps("SELECT a.* from BO_EU_DNCTT_CONTRACT_COST_PRODUCT a JOIN BO_EU_DNCTT_CONTRACT_COST b ON a.BINDID=b.BINDID WHERE a.WAREHOUSE_ID=? AND b.PRODUCT_ID=?", new Object[]{stockMap.getString("WAREHOUSE_ID"), stockMap.getString("PRODUCT_ID")});
+        List<RowMap> pickList = DBSql.getMaps("SELECT a.* from BO_EU_DNCTT_CONTRACT_COST_PRODUCT a JOIN BO_EU_DNCTT_CONTRACT_COST b ON a.CONTRACT_COST_ID=b.ID WHERE a.WAREHOUSE_ID=? AND b.PRODUCT_ID=?", new Object[]{stockMap.getString("WAREHOUSE_ID"), stockMap.getString("PRODUCT_ID")});
 
         List<String> selectedSns = new ArrayList<>();//默认选择
         for (RowMap lotMap : lotList) {
@@ -328,7 +328,10 @@ public class contractCostController {
         newCostProductBO.set("SN", sns);
         newCostProductBO.set("QUANTITY", orderQuantity);
         newCostProductBO.set("ID", StringUtils.EMPTY);
-        SDK.getBOAPI().createDataBO("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", newCostProductBO, uc);
+
+        ProcessInstance processInstance = SDK.getProcessAPI().createBOProcessInstance("obj_6bc913271069455abbd516c556b26d31", uc.getUID(), "合同产品物流管理");
+        newCostProductBO.setBindId(processInstance.getId());
+        SDK.getBOAPI().create("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", newCostProductBO, processInstance, uc);
 
         if (StringUtils.isNotBlank(movePro)) {
             return ResponseObject.newOkResponse("采购单产品已全部关联,但存在已移动的仓库产品,请重新关联!" + movePro);

+ 1 - 2
com.awspaas.user.apps.donenow_ctt/src/com/awspaas/user/apps/donenow_ctt/event/costPickFormAfterSave.java

@@ -108,7 +108,6 @@ public class costPickFormAfterSave extends ExecuteListener {
             }
 
             BO costProductBO = new BO();
-
             ProcessInstance processInstance = SDK.getProcessAPI().createBOProcessInstance("obj_6bc913271069455abbd516c556b26d31", processExecutionContext.getUserContext().getUID(), "合同产品物流管理");
 
             costProductBO.setBindId(processInstance.getId());
@@ -120,7 +119,7 @@ public class costPickFormAfterSave extends ExecuteListener {
             costProductBO.set("SN", pick_sns);
             costProductBO.set("STATUS_ID", STATUS_ID);
             costProductBO.set("OLD_QUANTITY", costProductBO.get("QUANTITY"));//配送数量
-            SDK.getBOAPI().createDataBO("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", costProductBO, processExecutionContext.getUserContext(), conn);
+            SDK.getBOAPI().create("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", costProductBO, processInstance,processExecutionContext.getUserContext(), conn);
 
 
             //修改状态

二進制
com.awspaas.user.apps.donenow_ivt/lib/com.awspaas.user.apps.donenow_ivt.jar


+ 1 - 1
com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/event/DoWorkThread.java

@@ -250,7 +250,7 @@ public class DoWorkThread extends Thread {
                     BO costProduct = SDK.getBOAPI().query(IVTConstant.BO_EU_DNCTT_CONTRACT_COST_PRODUCT).addQuery("ORDER_ID=", bo.getString("ORDER_ID")).addQuery("CONTRACT_COST_ID=", bo.getString("CONTRACT_COST_ID")).detail();
                     if (costProduct != null) {
                         costProduct.set("STATUS_ID", "2158");//待配送
-                        costProduct.set("SN", DBSql.getString("SELECT GROUP_CONCAT(SN) FROM BO_EU_DNIVT_WAREHOUSE_PRODUCT_LOT WHERE ORDER_PRODUCT_ID=?", new Object[]{costProduct.getId()}));
+                        costProduct.set("SN", DBSql.getString("SELECT GROUP_CONCAT(SN) FROM BO_EU_DNIVT_WAREHOUSE_PRODUCT_LOT WHERE ORDER_PRODUCT_ID=?", new Object[]{bo.getId()}));
                         try {
                             //记录日志
                             dn.recordFormChanges.record(uc, costProduct, "采购产品接收后更新");

+ 5 - 2
com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/event/ivtOrderProcessAfterComplete.java

@@ -3,6 +3,7 @@ package com.awspaas.user.apps.donenow_ivt.event;
 import com.actionsoft.bpms.bo.engine.BO;
 import com.actionsoft.bpms.bpmn.engine.core.delegate.ProcessExecutionContext;
 import com.actionsoft.bpms.bpmn.engine.listener.ExecuteListener;
+import com.actionsoft.bpms.bpmn.engine.model.run.delegate.ProcessInstance;
 import com.actionsoft.bpms.server.UserContext;
 import com.actionsoft.bpms.util.DBSql;
 import com.actionsoft.sdk.local.SDK;
@@ -49,9 +50,11 @@ public class ivtOrderProcessAfterComplete extends ExecuteListener {
                 String id = DBSql.getString(sql, new Object[]{purchaseOrder.getId(), cost.getId()});
                 SDK.getBOAPI().remove("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", id);//删除旧数据
 
+                ProcessInstance processInstance = SDK.getProcessAPI().createBOProcessInstance("obj_6bc913271069455abbd516c556b26d31", processExecutionContext.getUserContext().getUID(), "合同产品物流管理");
+
                 //提交采购订单添加成本产品
                 BO costProduct = new BO();
-                costProduct.setBindId(cost.getString("BINDID"));
+                costProduct.setBindId(processInstance.getId());
                 costProduct.set("ORDER_ID", purchaseOrder.getId());
                 costProduct.set("CONTRACT_COST_ID", cost.getString("ID"));
                 costProduct.set("STATUS_ID", "2156");//采购中
@@ -67,7 +70,7 @@ public class ivtOrderProcessAfterComplete extends ExecuteListener {
 
                 }
 
-                SDK.getBOAPI().createDataBO("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", costProduct, uc);
+                SDK.getBOAPI().create("BO_EU_DNCTT_CONTRACT_COST_PRODUCT", costProduct, processInstance, uc);
 
             }
 

二進制
com.awspaas.user.apps.donenow_sys/lib/com.awspaas.user.apps.donenow_sys.jar