处理相关BUG

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

@@ -659,7 +659,7 @@ public class ServiceHPSC002 extends ServiceBase {
                 DaoUtils.update("HPSC002.check",map2);
 
                 //处理项目管理中物料状态
-                HPSCTools.updateProjStatus(hppz002.getProjCode());
+                HPSCTools.updateProjStatus(THPSC002.getProjCode());
 
             }
         } catch (PlatException e) {

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

@@ -360,7 +360,25 @@ function checkIn(id) {
     });
 }
 checkInCallback = function () {
+    var block = detailGrid.getEiBlock();
+    var result = resultGrid.getCheckedRows()
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    if (block != null) {
+        block.setRows([]);
+        detailGrid.setEiBlock(block);
+    }
+    var info = new EiInfo()
+    var productionOrderNo = result[0]['prodOrderNo'];
 
+    info.set("productionOrderNo",productionOrderNo);
+    EiCommunicator.send("HPSC006","queryDetail",info,{
+        onSuccess:function(ei){//返回结果集
+            detailGrid.setEiInfo(ei);
+        },onFail:function(ei){}
+    },{async:false});
 }
 let selectStock = function (id) {
     JSColorbox.open({

src/main/webapp/HP/SC/HPSC006.jsp

@@ -78,7 +78,8 @@
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
                          data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
             <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" maxLength="12" displayType="0.000" cname="总重(T)"/>
-
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
             <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" defaultValue=""
                               filter="contains" readonly="true">
                 <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
@@ -92,12 +93,11 @@
 <%--                <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>--%>
 <%--            </EF:EFComboColumn>--%>
 <%--            <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center"  readonly="true"/>--%>
-            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
-            <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date"
+
+            <EF:EFColumn ename="actualCompletionDate" cname="完成时间" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120" enable="false"/>
-            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/>
-            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量（T)" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="完工数量" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="完工重量（T)" width="100" readonly="true"/>
             <EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
                 <EF:EFOption label="计划中" value="0"/>
                 <EF:EFOption label="生产中" value="1"/>

src/main/webapp/HP/SC/HPSC098.jsp

@@ -12,12 +12,12 @@
 <%--			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 <%--			<EF:EFInput cname="组织名称" ename="groupName" blockId="inqu_status" row="0" colWidth="3"/>--%>
 
-			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="2" filter="contains"
+			<EF:EFSelect ename="inqu_status-0-factoryCode" cname="厂区名称" colWidth="3" filter="contains"
 						 template="#=textField#" valueTemplate="#=textField#">
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="2"
+			<EF:EFSelect ename="inqu_status-0-groupCode" cname="组织名称" filter="contains" required="false" colWidth="3"
 						 template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
 				<EF:EFOption label="请选择" value=""/>
 				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>