Skip to content

H
hp-smart
Commit 71062661 by liulei
Options

下料登记、下料清单优化

parent 213594bc
Showing with 95 additions and 48 deletions
src/main/java/com/baosight/hpjx/hp/pz/tools/HPPZTools.java
...@@ -384,4 +384,31 @@ public class HPPZTools { ...@@ -384,4 +384,31 @@ public class HPPZTools {
} }
} }
/**
* 判断存货档案是否存在，如果存在返回存货档案，否则新增并返回存货档案
*
* @param inventType 存货类型
* @param inventName 存货名称
*/
public static String checkAndSavePZ04(Integer inventType, String inventName) {
// 检查存货名称是否存在
String inventCode = HPPZTools.HpPz004.checkAndSave(inventType, inventName);
Map queryMap = new HashMap();
queryMap.put("inventType", inventType);
queryMap.put("inventCode", inventCode);
queryMap.put("inventName", inventName);
List<HPPZ006> dbPz006s = DaoBase.getInstance().query(HPPZ006.QUERY, queryMap);
if (CollectionUtils.isNotEmpty(dbPz006s)) {
return dbPz006s.get(0).getInventCode();
} else {
// 生成编码
HPPZ006 newPz006 = new HPPZ006();
newPz006.fromMap(queryMap);
newPz006.setStatus(CommonConstant.YesNo.YES_1.intValue());
newPz006.setSpec(HpPz006.jointSpec(newPz006.getLength(), newPz006.getWidth(), newPz006.getThick()));
DaoUtils.insert(HPPZ006.INSERT, newPz006);
return newPz006.getInventCode();
}
}
} }
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
...@@ -14,6 +14,7 @@ import com.baosight.hpjx.hp.sc.domain.*; ...@@ -14,6 +14,7 @@ import com.baosight.hpjx.hp.sc.domain.*;
import com.baosight.hpjx.util.AssertUtils; import com.baosight.hpjx.util.AssertUtils;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.LogUtils; import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.iplat4j.core.ei.EiBlock; import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
...@@ -112,10 +113,15 @@ public class ServiceHPSC006 extends ServiceBase { ...@@ -112,10 +113,15 @@ public class ServiceHPSC006 extends ServiceBase {
HPSC006.setProductionOrderNo(productionOrderNo); HPSC006.setProductionOrderNo(productionOrderNo);
HPSC006.setStatus(CommonConstant.YesNo.NO_0.intValue()); HPSC006.setStatus(CommonConstant.YesNo.NO_0.intValue());
HPSC006.setTotalWt(totalWt); HPSC006.setTotalWt(totalWt);
HPSC006.setInventCode(HPPZTools.HpPz004.checkAndSave(HPSC006.getInventType(),HPSC006.getInventName())); HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
// 去除日期字符串中的-
HPSC006.setPlanCompletionDate(StringUtil.removeHorizontalLine(HPSC006.getPlanCompletionDate()));
if(HPSC006.getFactoryCode()!=null && !(HPSC006.getFactoryCode().equals(" "))) { if(HPSC006.getFactoryCode()!=null && !(HPSC006.getFactoryCode().equals(" "))) {
AssertUtils.isEmpty(HPSC006.getOrgNo(), "已选择厂区，下料组不能为空"); AssertUtils.isEmpty(HPSC006.getOrgNo(), "已选择厂区，下料组不能为空");
HPSC006.setStatus(1); HPSC006.setStatus(1);
HPPZ011 HPPZ011 =(HPPZ011) dao.get("HPPZ011.get2","groupCode", HPSC006.getOrgNo());
HPSC006.setOrgName(HPPZ011.getGroupName());
HPSC006.setFactoryName(HPPZ011.getFactoryName());
} }
DaoUtils.insert("HPSC006.insert",HPSC006); DaoUtils.insert("HPSC006.insert",HPSC006);
} }
...@@ -157,7 +163,11 @@ public class ServiceHPSC006 extends ServiceBase { ...@@ -157,7 +163,11 @@ public class ServiceHPSC006 extends ServiceBase {
HPSC006.setProjName(projName); HPSC006.setProjName(projName);
HPSC006.setProductionOrderNo(productionOrderNo); HPSC006.setProductionOrderNo(productionOrderNo);
HPSC006.setTotalWt(totalWt); HPSC006.setTotalWt(totalWt);
HPSC006.setInventCode(HPPZTools.HpPz004.checkAndSave(HPSC006.getInventType(),HPSC006.getInventName())); HPSC006.setPlanCompletionDate(StringUtil.removeHorizontalLine(HPSC006.getPlanCompletionDate()));
HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
HPPZ011 HPPZ011 =(HPPZ011) dao.get("HPPZ011.get2","groupCode", HPSC006.getOrgNo());
HPSC006.setOrgName(HPPZ011.getGroupName());
HPSC006.setFactoryName(HPPZ011.getFactoryName());
DaoUtils.update("HPSC006.update",HPSC006); DaoUtils.update("HPSC006.update",HPSC006);
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
......
src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC006A.xml
...@@ -135,40 +135,40 @@ ...@@ -135,40 +135,40 @@
A.PRODUCTION_ORDER_NO = #productionOrderNo# A.PRODUCTION_ORDER_NO = #productionOrderNo#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventType"> <isNotEmpty prepend=" AND " property="inventType">
INVENT_TYPE = #inventType# A.INVENT_TYPE = #inventType#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventCode"> <isNotEmpty prepend=" AND " property="inventCode">
INVENT_CODE = #inventCode# A.INVENT_CODE = #inventCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventName"> <isNotEmpty prepend=" AND " property="inventName">
INVENT_NAME = #inventName# A.INVENT_NAME = #inventName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventLength"> <isNotEmpty prepend=" AND " property="inventLength">
INVENT_LENGTH = #inventLength# A.INVENT_LENGTH = #inventLength#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventWidth"> <isNotEmpty prepend=" AND " property="inventWidth">
INVENT_WIDTH = #inventWidth# A.INVENT_WIDTH = #inventWidth#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventThick"> <isNotEmpty prepend=" AND " property="inventThick">
INVENT_THICK = #inventThick# A.INVENT_THICK = #inventThick#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventSpec"> <isNotEmpty prepend=" AND " property="inventSpec">
INVENT_SPEC = #inventSpec# A.INVENT_SPEC = #inventSpec#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="material"> <isNotEmpty prepend=" AND " property="material">
MATERIAL = #material# A.MATERIAL = #material#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="planCompletionDate"> <isNotEmpty prepend=" AND " property="planCompletionDate">
PLAN_COMPLETION_DATE = #planCompletionDate# A.PLAN_COMPLETION_DATE = #planCompletionDate#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="num"> <isNotEmpty prepend=" AND " property="num">
NUM = #num# A.NUM = #num#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="unitWt"> <isNotEmpty prepend=" AND " property="unitWt">
UNIT_WT = #unitWt# A.UNIT_WT = #unitWt#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="totalWt"> <isNotEmpty prepend=" AND " property="totalWt">
TOTAL_WT = #totalWt# A.TOTAL_WT = #totalWt#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="actualCompletionDate"> <isNotEmpty prepend=" AND " property="actualCompletionDate">
A.ACTUAL_COMPLETION_DATE = #actualCompletionDate# A.ACTUAL_COMPLETION_DATE = #actualCompletionDate#
...@@ -183,37 +183,37 @@ ...@@ -183,37 +183,37 @@
A.ORG_NO = #orgNo# A.ORG_NO = #orgNo#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="orgName"> <isNotEmpty prepend=" AND " property="orgName">
ORG_NAME = #orgName# A.ORG_NAME = #orgName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryCode"> <isNotEmpty prepend=" AND " property="factoryCode">
A.FACTORY_CODE = #factoryCode# A.FACTORY_CODE = #factoryCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="factoryName"> <isNotEmpty prepend=" AND " property="factoryName">
FACTORY_NAME = #factoryName# A.FACTORY_NAME = #factoryName#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="createdBy"> <isNotEmpty prepend=" AND " property="createdBy">
CREATED_BY = #createdBy# A.CREATED_BY = #createdBy#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="createdTime"> <isNotEmpty prepend=" AND " property="createdTime">
CREATED_TIME = #createdTime# A.CREATED_TIME = #createdTime#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedBy"> <isNotEmpty prepend=" AND " property="updatedBy">
UPDATED_BY = #updatedBy# A.UPDATED_BY = #updatedBy#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="updatedTime"> <isNotEmpty prepend=" AND " property="updatedTime">
UPDATED_TIME = #updatedTime# A.UPDATED_TIME = #updatedTime#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="depCode"> <isNotEmpty prepend=" AND " property="depCode">
DEP_CODE = #depCode# A.DEP_CODE = #depCode#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="remark"> <isNotEmpty prepend=" AND " property="remark">
REMARK = #remark# A.REMARK = #remark#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="filePath1"> <isNotEmpty prepend=" AND " property="filePath1">
FILE_PATH1 = #filePath1# A.FILE_PATH1 = #filePath1#
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="inventRecordId"> <isNotEmpty prepend=" AND " property="inventRecordId">
INVENT_RECORD_ID = #inventRecordId# A.INVENT_RECORD_ID = #inventRecordId#
</isNotEmpty> </isNotEmpty>
</sql> </sql>
......
src/main/webapp/HP/SC/HPSC006.jsp
...@@ -16,12 +16,10 @@ ...@@ -16,12 +16,10 @@
<EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%> <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
<div class="row"> <%-- blockId="inqu_status" row="0" --%> <div class="row"> <%-- blockId="inqu_status" row="0" --%>
<EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" row="0"/> <EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" colWidth="3" row="0"/>
<EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/> <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" colWidth="3" row="0"/>
<EF:EFInput blockId="inqu_status" ename="prodOrderNo" cname="生产订单号:" row="0"/> <EF:EFInput blockId="inqu_status" ename="prodOrderNo" cname="生产订单号:" colWidth="3" row="0"/>
<EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" /> <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" colWidth="3" format="yyyy-MM-dd" />
<EF:EFInput blockId="inqu_status" ename="orgNo" cname="生产组:" row="0"/>
</div> </div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%> <%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
</EF:EFRegion> </EF:EFRegion>
...@@ -60,19 +58,29 @@ ...@@ -60,19 +58,29 @@
valueField="textField" textField="textField"/>--%> valueField="textField" textField="textField"/>--%>
<EF:EFColumn ename="inventName" cname="材料名称" width="200" align="center" required="true" maxLength="50"/> <EF:EFColumn ename="inventName" cname="材料名称" width="200" align="center" required="true" maxLength="50"/>
<EF:EFColumn ename="inventCode" enable="false" cname="材料编码" hidden="true"/> <EF:EFColumn ename="inventCode" enable="false" cname="材料编码" hidden="true"/>
<EF:EFColumn ename="inventLength" width="80" cname="长" format="{0:N3}"/> <EF:EFColumn ename="inventLength" width="80" cname="长" format="{0:N3}" maxLength="12" displayType="0.000"
<EF:EFColumn ename="inventWidth" width="80" cname="宽" format="{0:N3}"/> data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
<EF:EFColumn ename="inventThick" width="80" cname="厚" format="{0:N3}"/> data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
<EF:EFColumn ename="inventWidth" width="80" cname="宽" format="{0:N3}" maxLength="12" displayType="0.000"
data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
<EF:EFColumn ename="inventThick" width="80" cname="厚" format="{0:N3}" maxLength="12" displayType="0.000"
data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
<EF:EFColumn ename="material" width="80" cname="材质" /> <EF:EFColumn ename="material" width="80" cname="材质" />
<EF:EFColumn ename="remark" cname="备注" /> <EF:EFColumn ename="remark" cname="备注" />
<EF:EFColumn ename="num" width="80" cname="数量"/> <EF:EFColumn ename="num" width="80" cname="数量" maxLength="12" displayType="0.000"
<EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重"/> data-regex="/^-?[0-9]{1,9}$/"
<EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" cname="总重"/> data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
<EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重" maxLength="12" displayType="0.000"
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="总重"/>
<EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center"
filter="contains" readonly="true"> filter="contains" readonly="true">
<EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/> <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn ename="orgNo" cname="生产组" width="110" align="center" readonly="true"/> <EF:EFColumn ename="orgNo" cname="下料组" width="110" align="center" readonly="true"/>
<EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date" <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" width="120"/>
<EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date"
......
src/main/webapp/HP/SC/HPSC006A.jsp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect cname="生产组" ename="orgNo" blockId="inqu_status" row="0" colWidth="3" filter="contains"> <EF:EFSelect cname="下料组" ename="orgNo" blockId="inqu_status" row="0" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
......
src/main/webapp/HP/SC/HPSC007.jsp
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
<div class="row"> <div class="row">
<EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionNum" cname="完工数量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量" colWidth="4" readonly="true"/> <EF:EFInput ename="detail-0-actualCompletionTotalWt" cname="完工重量" colWidth="4" readonly="true"/>
<EF:EFInput ename="detail-0-planCompletionDate" cname="计划完成日期" colWidth="4" readonly="true"/> <EF:EFDatePicker cname="计划完成日期" ename="detail-0-planCompletionDate" row="0" colWidth="4"
format="yyyy-MM-dd" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true"> <EF:EFSelect ename="detail-0-status" cname="状态" colWidth="4" readonly="true">
...@@ -44,16 +45,17 @@ ...@@ -44,16 +45,17 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="actualCompletionDate" editType="date" cname="完成日期" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" /> <EF:EFColumn ename="actualCompletionDate" editType="date" cname="完成日期" dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" />
<EF:EFColumn ename="hpsc006Id" cname="生产下料ID" hidden="true"/> <EF:EFColumn ename="hpsc006Id" cname="生产下料ID" hidden="true"/>
<EF:EFPopupColumn ename="userId" cname="完成人" popupType="ServiceGrid" <EF:EFComboColumn ename="userId" cname="完成人" width="100" align="center"
popupTitle="人员信息" serviceName="HPXSUser" methodName="queryComboBox" resultId="user_block_id" filter="contains" readonly="true">
columnEnames="textField,valueField" <EF:EFOptions blockId="user_block_id" valueField="valueField" textField="textField"/>
columnCnames="登录名称,用户名" </EF:EFComboColumn>
backFillColumnIds="textField,valueField"
backFillFieldIds="userName,userId"
valueField="valueField" textField="valueField"/>
<EF:EFColumn ename="userName" cname="完成名称" hidden="true"/> <EF:EFColumn ename="userName" cname="完成名称" hidden="true"/>
<EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" /> <EF:EFColumn ename="actualCompletionNum" cname="完成数量" format="{0:N3}" maxLength="12" displayType="0.000"
<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量" enable="false" format="{0:N3}"/> data-regex="/^-?[0-9]{1,9}$/"
data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
<EF:EFColumn ename="actualCompletionTotalWt" cname="完成重量" enable="false" format="{0:N3}" maxLength="12" displayType="0.000"
data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
</EF:EFPage> </EF:EFPage>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment