生产任务日期逻辑调整2

src/main/java/com/baosight/hggp/hg/sc/domain/HGSC007.java

@@ -64,7 +64,7 @@ public class HGSC007 extends DaoEPBase {
 	public static final String FIELD_updated_by = "updatedBy";    		/* 更新人*/
 	public static final String FIELD_updated_name = "updatedName";    		/* 修改人名称*/
 	public static final String FIELD_updated_time = "updatedTime";    		/* 更新时间*/
-	public static final String FIELD_order_date = "orderDate";    		/* 生产任务日期*/
+
 
 	public static final String COL_id = "id";
 	public static final String COL_mat_id = "mat_id";    		/* 物料清单ID*/
@@ -157,7 +157,7 @@ public class HGSC007 extends DaoEPBase {
 	private String updatedName = " ";		/* 修改人名称*/
 	private String updatedTime = " ";		/* 更新时间*/
 
-	private String orderDate = " ";		/* 生产任务日期*/
+
 
 	/**
 	 * initialize the metadata.
@@ -342,9 +342,7 @@ public class HGSC007 extends DaoEPBase {
 		eiColumn.setDescName("更新时间");
 		eiMetadata.addMeta(eiColumn);
 
-		eiColumn = new EiColumn(FIELD_order_date);
-		eiColumn.setDescName("生产任务日期");
-		eiMetadata.addMeta(eiColumn);
+
 
 	}
 
@@ -1012,18 +1010,6 @@ public class HGSC007 extends DaoEPBase {
 		this.updatedTime = updatedTime;
 	}
 
-	/**
-	 * set the orderDate - 生产任务日期.
-	 *
-	 * @param orderDate - 生产任务日期
-	 */
-	public void setOrderDate(String orderDate) {
-		this.orderDate = orderDate;
-	}
-
-	public String getOrderDate() {
-		return orderDate;
-	}
 
 	/**
 	 * get the value from Map.
@@ -1074,7 +1060,7 @@ public class HGSC007 extends DaoEPBase {
 		setUpdatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_by)), updatedBy));
 		setUpdatedName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_name)), updatedName));
 		setUpdatedTime(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_updated_time)), updatedTime));
-		setOrderDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_order_date)), orderDate));
+
 	}
 
 	/**
@@ -1125,7 +1111,6 @@ public class HGSC007 extends DaoEPBase {
 		map.put(FIELD_updated_by, StringUtils.toString(updatedBy, eiMetadata.getMeta(FIELD_updated_by)));
 		map.put(FIELD_updated_name, StringUtils.toString(updatedName, eiMetadata.getMeta(FIELD_updated_name)));
 		map.put(FIELD_updated_time, StringUtils.toString(updatedTime, eiMetadata.getMeta(FIELD_updated_time)));
-		map.put(FIELD_order_date, StringUtils.toString(orderDate, eiMetadata.getMeta(FIELD_order_date)));
 
 		return map;
 	}

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java

@@ -82,14 +82,11 @@ public class ServiceHGSC006A extends ServiceBase {
                 }
                 // 写入子表数据
                 HGSC007 hgsc007 = new HGSC007();
-                String getCreatedTime = hgsc006.getCreatedTime();		//获取订单创建时间,并截取
-                String subCreatedTime =getCreatedTime.substring(0,8);
                 BeanUtils.copyProperties(hgsc006A,hgsc007);
                 cleanBaseInfo(hgsc007);
                 hgsc007.setTaskCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGSC007_TASK_CODE));
                 hgsc007.setMatId(hgsc006.getMatId());
                 hgsc007.setOrderId(hgsc006.getId());
-                hgsc007.setOrderDate(subCreatedTime);
                 hgsc007.setOrderDetailId(hgsc006A.getId());
                 hgsc007.setQuantity(assignQuantity);
                 hgsc007.setTotalWeight(hgsc006A.getSingleWeight().multiply(new BigDecimal(assignQuantity)));

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006B.java

@@ -183,14 +183,11 @@ public class ServiceHGSC006B extends ServiceBase {
 		HGSCTools.checkAssignedNum(orderDetailId, hgsc007.getQuantity());
 
 		HGSC007 add007 = new HGSC007();
-		String getCreatedTime = hgsc006.getCreatedTime();		//获取订单创建时间,并截取
-		String subCreatedTime =getCreatedTime.substring(0,8);
 		BeanUtils.copyProperties(hgsc006A,add007);
 		cleanBaseInfo(add007);
 		add007.setTaskCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGSC007_TASK_CODE));
 		add007.setMatId(hgsc006.getMatId());
 		add007.setOrderId(hgsc006.getId());
-		add007.setOrderDate(subCreatedTime);
 		add007.setOrderDetailId(hgsc006A.getId());
 		add007.setQuantity(hgsc007.getQuantity());
 		add007.setTotalWeight(hgsc006A.getSingleWeight().multiply(new BigDecimal(hgsc007.getQuantity())));

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -36,9 +36,9 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
         public EiInfo query(EiInfo inInfo) {
             try {
                 EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
-                String orderDate = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_order_date);
-                if (!orderDate.isEmpty()) {
-                    inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_order_date, StringUtil.removeHorizontalLine(orderDate));
+                String creatTime = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time);
+                if (!creatTime.isEmpty()) {
+                    inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
                 }
 
                 inInfo = super.query(inInfo,HGSC007.QUERY,new HGSC007() );

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -160,7 +160,7 @@
 			created_name = #createdName#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdTime">
-			created_time = #createdTime#
+			created_time LIKE CONCAT('%',   #createdTime# ,'%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="updatedBy">
 			updated_by = #updatedBy#
@@ -171,9 +171,7 @@
 		<isNotEmpty prepend=" AND " property="updatedTime">
 			updated_time = #updatedTime#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="orderDate">
-			order_date = #orderDate#
-		</isNotEmpty>
+
 	</sql>
 
 	<select id="query" parameterClass="java.util.HashMap"
@@ -219,8 +217,7 @@
 		created_time	as "createdTime",  <!-- 创建时间 -->
 		updated_by	as "updatedBy",  <!-- 更新人 -->
 		updated_name	as "updatedName",  <!-- 修改人名称 -->
-		updated_time	as "updatedTime", <!-- 更新时间 -->
-		order_date	as "orderDate" <!-- 生产任务日期 -->
+		updated_time	as "updatedTime" <!-- 更新时间 -->
 		FROM ${hggpSchema}.HGSC007 WHERE 1=1
 		<include refid="condition" />
 
@@ -407,10 +404,10 @@
 		created_time,  <!-- 创建时间 -->
 		updated_by,  <!-- 更新人 -->
 		updated_name,  <!-- 修改人名称 -->
-		updated_time,  <!-- 更新时间 -->
-		order_date	 <!-- 生产任务日期 -->
+		updated_time <!-- 更新时间 -->
+
 		)
-		VALUES (#id#, #matId#, #orderId#, #orderDetailId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #taskCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #completeDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #singleWeight#, #totalWeight#, #finishWeight#, #unfinishWeight#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#,#orderDate#)
+		VALUES (#id#, #matId#, #orderId#, #orderDetailId#, #techFlowId#, #techFlowName#, #inventProcessId#, #processCode#, #processName#, #processOrder#, #companyCode#, #companyName#, #depCode#, #depName#, #projCode#, #projName#, #taskCode#, #productType#, #productCode#, #productName#, #planStartDate#, #planEndDate#, #factoryCode#, #factoryName#, #groupCode#, #groupName#, #completeDate#, #quantity#, #finishQuantity#, #unfinishQuantity#, #singleWeight#, #totalWeight#, #finishWeight#, #unfinishWeight#, #accountCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#)
 	</insert>
 
 	<delete id="delete">
@@ -460,8 +457,7 @@
 		created_time	= #createdTime#,   <!-- 创建时间 -->
 		updated_by	= #updatedBy#,   <!-- 更新人 -->
 		updated_name	= #updatedName#,   <!-- 修改人名称 -->
-		updated_time	= #updatedTime#,  <!-- 更新时间 -->
-		order_date	= #orderDate# <!-- 生产任务日期 -->
+		updated_time	= #updatedTime#  <!-- 更新时间 -->
 		WHERE
 		id = #id#
 	</update>

src/main/webapp/HG/SC/HGSC007.jsp

@@ -22,7 +22,7 @@
 
             <EF:EFInput blockId="inqu_status" row="0" ename="productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="班组名称" placeholder="模糊查询" colWidth="3"/>
-            <EF:EFDatePicker blockId="inqu_status" row="0" ename="orderDate" cname="生产任务日期" role="date"
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="createdTime" cname="生产任务日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <%--<EF:EFDatePicker blockId="inqu_status" row="0" ename="complete_date" cname="生产完工日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>--%>
@@ -39,7 +39,7 @@
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="220" align="center"/>
             <EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="projName" cname="项目名称" enable="true" width="120" align="center" readOnly="true"/>
-            <EF:EFColumn ename="orderDate" cname="生产任务日期" width="120" enable="true" readonly="false" align="center" editType="date"
+            <EF:EFColumn ename="createdTime" cname="生产任务日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFColumn ename="taskCode" cname="生产任务单号" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="productCode" cname="产品编码" width="100" enable="false" readonly="true" align="center"/>