增加公司过滤

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

@@ -200,7 +200,7 @@ public class ServiceHPSC003 extends ServiceBase {
                 HPSC005.setNum(HPSC004.getNum());
                 HPSC005.setTotalWt(HPSC004.getUnitWt());
                 HPSC005.setStatus(0);
-                HPSC005.setFilePath1(HPSC004.getId().toString());
+                HPSC005.setFilePath1(HPSC004.getFilePath1());
                 DaoUtils.insert("HPSC005.insert", HPSC005.toMap());
 
                 HPSC004.setProductionOrderNo(SCDD);

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

 package com.baosight.hpjx.hp.sc.service;
 
+import com.baosight.hpjx.core.security.UserSessionUtils;
 import com.baosight.hpjx.hp.sc.domain.HPSC004;
 import com.baosight.hpjx.hp.sc.domain.HPSC005;
 import com.baosight.iplat4j.core.ei.EiBlock;
@@ -10,6 +11,7 @@ import com.baosight.xservices.xs.og.domain.XSOG01;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -22,6 +24,7 @@ public class ServiceHPSC098 extends ServiceBase {
      */
     public EiInfo initLoad(EiInfo inInfo) {
         EiInfo outInfo = new EiInfo();
+        outInfo.set("inqu_status-0-companyCode", UserSessionUtils.getCompanyCode());
         outInfo.set("inqu_status-0-orgCname", inInfo.get("inqu_status-0-orgCname"));
         outInfo = super.query(outInfo, "XSOG0801.queryOrgList", new XSOG01());
         EiBlock r3Block = new EiBlock("result");
@@ -38,6 +41,7 @@ public class ServiceHPSC098 extends ServiceBase {
         EiBlock eiBlock = outInfo.addBlock("result");
         HashMap params = new HashMap();
         params.put("orgCname",inInfo.get("inqu_status-0-orgCname"));
+        params.put("companyCode", UserSessionUtils.getCompanyCode());
         List list = dao.query("XSOG0801.queryOrgList",params,0,-999999);
         outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(XSOG01.eiMetadata);
         outInfo.addBlock(EiConstant.resultBlock).addRows(list);

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

@@ -20,7 +20,7 @@
         <div class="row">
             <EF:EFInput blockId="inqu_status" ename="planInfoNo" colWidth="3" cname="生产计划单号:" row="0"/>
             <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" colWidth="3" cname="计划完成日期:"
-                             format="yyyy-MM-dd" required="true"/>
+                             format="yyyy-MM-dd"/>
             <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" row="0">
                 <EF:EFOption label="未审核" value="0"/>
                 <EF:EFOption label="已审核" value="1"/>