增加销售单变更交货时间同步

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

@@ -157,6 +157,7 @@ public class ServiceHPSC002 extends ServiceBase {
 			for (int i = 0; i < resultRows.size(); i++) {
 				HPSC002 hpsc002 = new HPSC002();
 				hpsc002.fromMap(resultRows.get(i));
+				hpsc002.setDeliveryDate(DateUtils.formatShort(hpsc002.getDeliveryDate()));
 				if (hpsc002.getId() == null || hpsc002.getId() == 0) {
 					hpsc002.setDeliveryDate(DateUtils.formatShort(hpsc002.getDeliveryDate()));
 					this.add(hpsc002);
@@ -178,6 +179,9 @@ public class ServiceHPSC002 extends ServiceBase {
 	public EiInfo add(HPSC002 hpsc002) {
 		EiInfo inInfo = new EiInfo();
 		try {
+			//单独新增需要拿到销售单的交货日期
+			HPSC001 hpsc001 = HPSCTools.HpSc001.get(hpsc002.getProjCode());
+			hpsc002.setDeliveryDate(hpsc001.getDeliveryDate());
 			hpsc002.setLeaf("1");
 			// 计算总重
 			BigDecimal num = hpsc002.getNum();
@@ -499,6 +503,8 @@ public class ServiceHPSC002 extends ServiceBase {
 		HPSC003.setWidth(hppz002.getWidth());
 		HPSC003.setThick(hppz002.getThick());
 		HPSC003.setSpec(HPPZTools.HpPz006.jointSpec(HPSC003.getLength(),HPSC003.getWidth(),HPSC003.getThick()));
+		HPSC003.setDeliveryDate(hppz002.getDeliveryDate());
+		HPSC003.setPlanCompletionDate(hppz002.getDeliveryDate());
 		DaoUtils.update("HPSC003.update", HPSC003.toMap());
 	}
 
@@ -510,6 +516,7 @@ public class ServiceHPSC002 extends ServiceBase {
 		HPSC004.setUnitWt(hppz002.getUnitWt());
 		HPSC004.setTotalWt(hppz002.getTotalWt());
 		HPSC004.setSpec(HPPZTools.HpPz006.jointSpec(HPSC004.getLength(),HPSC004.getWidth(),HPSC004.getThick()));
+//		HPSC004.setDeliveryDate(hppz002.getDeliveryDate());
 		DaoUtils.update("HPSC004.update", HPSC004.toMap());
 	}
 	

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

@@ -84,15 +84,15 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="prdtCode" cname="部件编码" hidden='true'/>
             <EF:EFColumn ename="prdtName" cname="部件名称" width="140" align="center" maxLength="50" required="true"/>
-            <EF:EFColumn ename="length" cname="长(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+            <EF:EFColumn ename="length" cname="长(MM)" width="80" format="{0:N0}" maxLength="12" displayType="0.000"
                              data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
-                             data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-            <EF:EFColumn ename="width" cname="宽(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+                             data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
+            <EF:EFColumn ename="width" cname="宽(MM)" width="80" format="{0:N0}" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
-                         data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
-            <EF:EFColumn ename="thick" cname="厚(MM)" width="80" format="{0:N3}" maxLength="12" displayType="0.000"
+                         data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
+            <EF:EFColumn ename="thick" cname="厚(MM)" width="80" format="{0:N0}" maxLength="12" displayType="0.000"
                          data-regex="/^-?[0-9]{1,9}([.][0-9]{1,3})?$/"
-                         data-errorprompt="请输入数字，该值最大可设置9位整数和3位小数！"/>
+                         data-errorprompt="请输入数字，该值最大可设置9位整数！"/>
             <EF:EFColumn ename="deliveryDate" cname="交货日期" width="100" editType="date" required='true' align="center"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>
             <EF:EFColumn ename="num" cname="数量" maxLength="15" displayType="0.000" format="{0:N0}" required="true"

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

@@ -36,3 +36,4 @@
 		<EF:EFButton ename="confirm"  cname="确认" type="button" class="btn-align-right"/>
 	</div>
 </EF:EFPage>
+