Commit 47bdd0f4 by 971729

Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev

parents c9d96d36 71518ff2
...@@ -6,6 +6,7 @@ import com.baosight.hpjx.common.InventTypeEnun; ...@@ -6,6 +6,7 @@ import com.baosight.hpjx.common.InventTypeEnun;
import com.baosight.hpjx.hp.kc.domain.THpkc003; import com.baosight.hpjx.hp.kc.domain.THpkc003;
import com.baosight.hpjx.hp.pz.domain.THppz006; import com.baosight.hpjx.hp.pz.domain.THppz006;
import com.baosight.hpjx.util.CommonMethod; import com.baosight.hpjx.util.CommonMethod;
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;
...@@ -31,7 +32,6 @@ public class ServiceHPKC003 extends ServiceBase { ...@@ -31,7 +32,6 @@ public class ServiceHPKC003 extends ServiceBase {
EiInfo outInfo = new EiInfo(); EiInfo outInfo = new EiInfo();
outInfo.addBlock(EiConstant.resultBlock); outInfo.addBlock(EiConstant.resultBlock);
outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(hpkc003.eiMetadata); outInfo.getBlock(EiConstant.resultBlock).addBlockMeta(hpkc003.eiMetadata);
return outInfo; return outInfo;
} }
...@@ -59,6 +59,8 @@ public class ServiceHPKC003 extends ServiceBase { ...@@ -59,6 +59,8 @@ public class ServiceHPKC003 extends ServiceBase {
// String[] str = inventName.split("-"); // String[] str = inventName.split("-");
// inInfo.setCell(EiConstant.resultBlock,i,"inventCode", str[0]); // inInfo.setCell(EiConstant.resultBlock,i,"inventCode", str[0]);
// inInfo.setCell(EiConstant.resultBlock,i,"inventName", str[1]); // inInfo.setCell(EiConstant.resultBlock,i,"inventName", str[1]);
String documentDate = inInfo.getCellStr(EiConstant.resultBlock,i,"documentDate");
inInfo.setCell(EiConstant.resultBlock,i,"documentDate", StringUtil.removeHorizontalLine(documentDate));
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
...@@ -87,7 +89,8 @@ public class ServiceHPKC003 extends ServiceBase { ...@@ -87,7 +89,8 @@ public class ServiceHPKC003 extends ServiceBase {
for (int i = 0; i < eiBlock.getRowCount(); i++) { for (int i = 0; i < eiBlock.getRowCount(); i++) {
Map<?, ?> map = eiBlock.getRow(i); Map<?, ?> map = eiBlock.getRow(i);
hpkc003.fromMap(map); hpkc003.fromMap(map);
String documentDate = inInfo.getCellStr(EiConstant.resultBlock,i,"documentDate");
inInfo.setCell(EiConstant.resultBlock,i,"documentDate", StringUtil.removeHorizontalLine(documentDate));
this.dao.update("HPKC003.update", hpkc003.toMap()); this.dao.update("HPKC003.update", hpkc003.toMap());
} }
inInfo.setStatus(EiConstant.STATUS_SUCCESS); inInfo.setStatus(EiConstant.STATUS_SUCCESS);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<EF:EFRegion id="inqu" title="查询条件"> <EF:EFRegion id="inqu" title="查询条件">
<div class="row"> <div class="row">
<EF:EFDatePicker ename="inqu_status-0-documentDate" cname="单据日期" <EF:EFDatePicker ename="inqu_status-0-documentDate" cname="单据日期"
format="yyyy-MM-dd" required="true"/> format="yyyy-MM-dd"/>
<EF:EFInput ename="inqu_status-0-productionNumber" cname="生产入库单号" colWidth="4" readonly="false"/> <EF:EFInput ename="inqu_status-0-productionNumber" cname="生产入库单号" colWidth="4" readonly="false"/>
<EF:EFInput ename="inqu_status-0-warehouseName" cname="仓库名称" colWidth="4" readonly="false"/> <EF:EFInput ename="inqu_status-0-warehouseName" cname="仓库名称" colWidth="4" readonly="false"/>
</div> </div>
...@@ -25,12 +25,18 @@ ...@@ -25,12 +25,18 @@
<EF:EFColumn ename="productionNumber" cname="生产入库单号" width="100" readonly="false" required="true"/> <EF:EFColumn ename="productionNumber" cname="生产入库单号" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="warehouseCode" cname="仓库编码" width="100" readonly="false" required="true"/> <EF:EFColumn ename="warehouseCode" cname="仓库编码" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="warehouseName" cname="仓库名称" width="100" readonly="false" required="true"/> <EF:EFColumn ename="warehouseName" cname="仓库名称" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="materialType" cname="物料类型" width="100" readonly="false" required="true"/> <EF:EFComboColumn ename="materialType" cname="物料类型" align="center"
columnTemplate="#=valueField#-#=textField#" optionLabel=" "
itemTemplate="#=valueField#-#=textField#" textField="textField"
valueField="valueField" width="100">
<EF:EFOption label="--请选择--" value=""></EF:EFOption>
<EF:EFOption label="待补充" value="1"></EF:EFOption>
</EF:EFComboColumn>
<EF:EFColumn ename="materialCode" cname="物料编码" width="100" readonly="false" required="true"/> <EF:EFColumn ename="materialCode" cname="物料编码" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" required="true"/> <EF:EFColumn ename="materialName" cname="物料名称" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="number" cname="数量" width="100" readonly="false" required="true"/> <EF:EFColumn ename="number" cname="数量" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="weight" cname="重量" width="100" readonly="false" required="true"/> <EF:EFColumn ename="weight" cname="重量" width="100" readonly="false" required="true"/>
<EF:EFColumn ename="remark" cname="备注" width="100" readonly="false" required="true"/> <EF:EFColumn ename="remark" cname="备注" width="100" readonly="false" />
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
......
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