增加存货档案ID

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC002.java

@@ -296,13 +296,13 @@ public class ServiceHPSC002 extends ServiceBase {
             }
         } catch (PlatException e) {
             eiInfo.setStatus(EiConstant.STATUS_FAILURE);
-            eiInfo.setMsg("删除失败，原因参见详细错误描述！");
+            eiInfo.setMsg("审核失败，原因参见详细错误描述！");
             eiInfo.setDetailMsg(e.getMessage());
-            logError("删除失败！", e.getMessage());
+            logError("审核失败！", e.getMessage());
             return eiInfo;
         }
         eiInfo.setStatus(EiConstant.STATUS_SUCCESS);
-        eiInfo.setMsg("删除成功！");
+        eiInfo.setMsg("审核成功！");
         return eiInfo;
     }
 
@@ -349,6 +349,7 @@ public class ServiceHPSC002 extends ServiceBase {
         HPSC003.setProjCode(THPSC002.getProjCode());
         HPSC003.setProjName(THPSC002.getProjName());
         HPSC003.setPlanInfoNo(SCJHD);
+        HPSC003.setInventRecordId(THPSC002.getInventRecordId());
         HPSC003.setPrdtType(THPSC002.getPrdtType());
         HPSC003.setPrdtCode(THPSC002.getPrdtCode());
         HPSC003.setPrdtName(THPSC002.getPrdtName());
@@ -374,6 +375,7 @@ public class ServiceHPSC002 extends ServiceBase {
             HPSC004.setProjName(HPSC002.getProjName());
             HPSC004.setParentId(SCJHD);
             HPSC004.setParentPrdtName(HPSC002.getParentPrdtName());
+            HPSC004.setInventRecordId(HPSC002.getInventRecordId());
             HPSC004.setPrdtType(HPSC002.getPrdtType());
             HPSC004.setPrdtCode(HPSC002.getPrdtCode());
             HPSC004.setPrdtName(HPSC002.getPrdtName());

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC003.java

@@ -184,7 +184,7 @@ public class ServiceHPSC003 extends ServiceBase {
             DaoUtils.update("HPSC003.update", HPSC003.toMap());
             //生成生产订单
             HashMap params = new HashMap();
-            params.put("parentId",HPSC003.getId());
+            params.put("parentId",HPSC003.getPlanInfoNo());
             List list = dao.query("HPSC004.queryDetail",params,0,-999999);
             for (int i = 0; i < list.size(); i ++) {
                 HPSC004 HPSC004 = (HPSC004) list.get(i);
@@ -193,6 +193,7 @@ public class ServiceHPSC003 extends ServiceBase {
                 HPSC005.setProjCode(HPSC003.getProjCode());
                 HPSC005.setProjName(HPSC003.getProjName());
                 HPSC005.setProductionOrderNo(SCDD);
+                HPSC005.setInventRecordId(HPSC004.getInventRecordId());
                 HPSC005.setPrdtType(HPSC004.getPrdtType());
                 HPSC005.setPrdtCode(HPSC004.getPrdtCode());
                 HPSC005.setPrdtName(HPSC004.getPrdtName());

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002.xml

@@ -359,8 +359,13 @@
 		UPDATED_TIME	as "updatedTime",  <!-- 更新时间 -->
 		REMARK	as "remark" <!-- 备注 -->
 		FROM hpjx.t_hpsc002
-		WHERE PARENT_ID = #id#
-		AND PROJ_CODE = #projCode#
+		WHERE 1 = 1
+		<isNotEmpty prepend=" AND " property="id">
+			PARENT_ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="projCode">
+			PROJ_CODE = #projCode#
+		</isNotEmpty>
 	</select>
 
 

src/main/webapp/HP/KC/HPKC003.js

@@ -106,6 +106,7 @@ let productionOrderQueryCallback = function (row) {
 		resultGrid.setCellValue(0, "inventType", row[i]["prdtType"]);
 		resultGrid.setCellValue(0, "inventCode", row[i]["prdtCode"]);
 		resultGrid.setCellValue(0, "inventName", row[i]["prdtName"]);
+		resultGrid.setCellValue(0, "inventRecordId", row[i]["inventRecordId"]);
 		lists[i] = i;
 	}
 	resultGrid.setCheckedRows(lists);

src/main/webapp/HP/KC/HPKC003.jsp

@@ -55,7 +55,7 @@
 			<EF:EFColumn cname="存货名称" ename="inventName" width="120" align="center" enable="false"/>
 			<EF:EFColumn ename="inventRecordId" cname="存货档案ID" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" editType="textarea" readonly="true"/>
-			<EF:EFColumn cname="原生产单号" ename="ProdNoOld" enable="false" width="140" align="center"/>
+			<EF:EFColumn cname="原生产单号" ename="prodNoOld" enable="false" width="140" align="center"/>
 			<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" width="120" align="center"/>
 			<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>

src/main/webapp/HP/KC/HPKC099.jsp

@@ -30,6 +30,7 @@
 
         <EF:EFGrid blockId="result" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="inventRecordId" cname="项目档案ID" hidden="true"/>
             <EF:EFColumn enable="false" ename="projCode" cname="项目号" />
             <EF:EFColumn enable="false" ename="projName" cname="项目名称"/>
             <EF:EFColumn enable="false" ename="productionOrderNo" cname="生产订单号"/>

src/main/webapp/HP/SC/HPSC003.js

@@ -49,7 +49,7 @@ $(function () {
                     detailGrid.setEiBlock(block);
                 }
                 var info = new EiInfo()
-                var parentId = e.model['id'];
+                var parentId = e.model['planInfoNo'];
                 info.set("parentId",parentId);
                 EiCommunicator.send("HPSC004","queryDetail",info,{
                     onSuccess:function(ei){//返回结果集