采购订单修改

com.awspaas.user.apps.donenow_crm/src/com/awspaas/user/apps/donenow_crm/controller/crmLocationController.java

@@ -35,7 +35,7 @@ public class crmLocationController {
             return ResponseObject.newErrResponse("参数错误");
         String binidid = null;
         if (StringUtils.isNotBlank(locationId)) {
-            binidid = DBSql.getString("select BINDID from BO_EU_DNCRM_LOCATION_TEMP where LOCATION_ID=?", new Object[]{locationId});
+            binidid = DBSql.getString("select BINDID from BO_EU_DNCRM_LOCATION_TEMP where ID=?", new Object[]{locationId});
         }
 
         //新增

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/IVTController.java

@@ -105,9 +105,11 @@ public class IVTController extends BaseController {
         String processDefId = DBSql.getString("select processdefid from wfc_process where id=?", new Object[]{bindId});
         ProcessInstance createBOProcessInstance = SDK.getProcessAPI().createBOProcessInstance(processDefId, uc.getUID(), "");
         BO bo = new BO();
+
         bo.setAll(detail.asMap());
         bo.setId(UUIDGener.getUUID());
         bo.setBindId(createBOProcessInstance.getId());
+        bo.set("SKU",detail.getString("SKU")+"_COPY");
         SDK.getBOAPI().create(tableName, bo, createBOProcessInstance, uc);
         //TaskInstance taskInst = SDK.getProcessAPI().start(createBOProcessInstance).fetchActiveTasks().get(0);
         String url = SDK.getFormAPI().getFormURL("", uc.getSessionId(), createBOProcessInstance.getId(), "", 1, "", "", "");

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/caiController.java

@@ -359,6 +359,36 @@ public class caiController {
             return ResponseObject.newErrResponse("查询失败：" + e.getMessage());
         }
     }
+    @Mapping(value = "com.awspaas.user.apps.donenow_ivt.queryContractByDes")
+    public ResponseObject queryContractByDes(UserContext uc, String des) {
+        if (StringUtils.isBlank(des)) {
+            return ResponseObject.newErrResponse("des（合同ID）不能为空");
+        }
+
+        String sql = "select description " +
+                "from `BO_EU_DNCTT_CONTRACT` " +
+                "where id = ? ";
+
+        String contractName = DBSql.getString(sql, new Object[]{des});
+
+        if (StringUtils.isBlank(contractName)) {
+            ResponseObject responseObject = ResponseObject.newOkResponse();
+            responseObject.put("message", "未找到id为【" + des + "】的合同信息");
+            responseObject.setData(Collections.emptyList());
+            return responseObject;
+        }
+
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        Map<String, Object> contractInfo = new HashMap<>();
+        contractInfo.put("id", des);
+        contractInfo.put("CONTRACT_NAME", contractName);
+        resultList.add(contractInfo);
+
+        ResponseObject responseObject = ResponseObject.newOkResponse();
+        responseObject.setData(resultList);
+        return responseObject;
+    }
+
 
 
 

com.awspaas.user.apps.donenow_ivt/src/com/awspaas/user/apps/donenow_ivt/controller/ivtOrderController.java

@@ -678,7 +678,7 @@ public class ivtOrderController {
                 purchaseOrderProduct.set("UNIT_COST", cost.getString("UNIT_COST"));
                 purchaseOrderProduct.set("TAX_CATEGORY_ID", cost.getString("TAX_CATEGORY_ID"));
                 purchaseOrderProduct.set("WAREHOUSE_ID", DBSql.getString("SELECT ID FROM bo_eu_dnivt_warehouse WHERE CATE_ID=2 AND ORGID=? ", new Object[]{uc.getCompanyModel().getId()}));//采购仓库 固定仓库
-
+                purchaseOrderProduct.set("NOTE", cost.getString("DESCRIPTION"));
                 // purchaseOrderProduct.set("UNIT_COST_ADD_TAX", cost.getString(""));//含税价
                 purchaseOrderProduct.set("COST_TOTAL", cost.getString("EXTENDED_COST"));
                 purchaseOrderProduct.set("CONTRACT_ID", cost.getString("CONTRACT_ID"));