2024-10-12 生产任务添加报工状态条件，文档管理添加状态和修改范围条件

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC014.java

@@ -188,7 +188,7 @@ public class ServiceHGKC014 extends ServiceEPBase {
 		        List<HGKC014A> hgkc14As = hgkc014AList.stream()
 				        .filter(item -> item.getParentId().equals(hgkc014.getId())).collect(Collectors.toList());
 		        AssertUtils.isTrue(hgkc14As.size() <= 0, "请先添加委外入库明细");
-		        AssertUtils.isTrue(hgkc014.getStatus().equals(HgKcConst.HgKc014.Status.S0), "当前委外入库任务已提交，不允许重复提交!");
+		        AssertUtils.isTrue(!hgkc014.getStatus().equals(HgKcConst.HgKc014.Status.S0), "当前委外入库任务已提交，不允许重复提交!");
 		        hgkc014.setStatus(HgKcConst.HgKc014.Status.S1);
 		        DaoUtils.update(HgKcSqlConstant.HgKc014.UPDATE_STATUS, hgkc014);
 		        // 更新明细状态

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC015.java

@@ -141,7 +141,7 @@ public class ServiceHGKC015 extends ServiceEPBase {
             for (HGKC015 hgkc015: resultMaps) {
                 List<HGKC015A> hgkc15As = hgkc015AList.stream().filter(item -> item.getParentId().equals(hgkc015.getId())).collect(Collectors.toList());
                 AssertUtils.isTrue(hgkc15As.size()<= 0, "请先添加委外出库明细");
-                AssertUtils.isTrue(hgkc015.getStatus().equals(HgKcConst.HgKc014.Status.S0), "当前委外入库任务已提交，不允许重复提交!");
+                AssertUtils.isTrue(!hgkc015.getStatus().equals(HgKcConst.HgKc014.Status.S0), "当前委外入库任务已提交，不允许重复提交!");
                 hgkc015.setStatus(CommonConstant.YesNo.YES_1);
                 DaoUtils.update(HgKcSqlConstant.HgKc015.UPDATE_STATUS, hgkc015);
                 for (HGKC015A hgkc015A: hgkc15As) {

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD002.xml

@@ -66,8 +66,11 @@
                 AND FILE_ID = #parentId#)
             </isNotEmpty>
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="createdTime">
-            LEFT(B.CREATED_TIME,8) = replace(#createdTime#,'-','')
+        <isNotEmpty prepend=" AND " property="createdDateFrom">
+            CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateTo">
+            CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="docType">
             B.DOC_TYPE = #docType#

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD099.xml

@@ -82,6 +82,12 @@
         <isNotEmpty prepend=" AND " property="createdDateTo">
             CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="updateDateFrom">
+            UPDATED_TIME &gt;= CONCAT(REPLACE(#updateDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="updateDateTo">
+            UPDATED_TIME &lt;= CONCAT(REPLACE(#updateDateTo#, '-', ''), '235959')
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="bizIds">
             BIZ_ID in <iterate close=")" open="(" conjunction="," property="bizIds">#bizIds[]#</iterate>
         </isNotEmpty>

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

@@ -26,6 +26,9 @@
 			             filter="contains">
 				<EF:EFOptions blockId="processCode_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+			<EF:EFSelect cname="报工状态" ename="status" blockId="inqu_status" row="0" colWidth="3" optionLabel="全部" filter="contains">
+				<EF:EFCodeOption codeName="hggp.hgsc.status"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 

src/main/webapp/HG/WD/HGWD001.jsp

@@ -66,8 +66,14 @@
 					<EF:EFInput cname="登录用户" ename="userId" blockId="inqu_status" row="0" colWidth="3" value="${loginName}" type="hidden"/>
 					<EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden" value="WD"/>
 					<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" />
-					<EF:EFDatePicker blockId="inqu_status" row="0" ename="updatedTime" cname="修改时间" role="date"
-									 format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
+					<EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="状态" colWidth="3">
+						<EF:EFOption label="全部" value=""/>
+						<EF:EFCodeOption codeName="hggp.hgwd.status"/>
+					</EF:EFSelect>
+					<EF:EFDateSpan startCname="修改时间" endCname="至" blockId="inqu_status" row="0"
+								   startName="updateDateFrom" endName="updateDateTo" role="date"
+								   format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="false">
+					</EF:EFDateSpan>
 				</div>
 			</EF:EFRegion>
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">

src/main/webapp/HG/WD/HGWD002.jsp

@@ -39,8 +39,10 @@
 						<EF:EFCodeOption codeName="hggp.hgwd.fileType"/>
 					</EF:EFSelect>
 					<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3"/>
-					<EF:EFDatePicker blockId="inqu_status" row="0" ename="createdTime" cname="上传时间" role="date"
-					                 format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
+					<EF:EFDateSpan startCname="上传时间" endCname="至" blockId="inqu_status" row="0"
+								   startName="createdDateFrom" endName="createdDateTo" role="date"
+								   format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="false">
+					</EF:EFDateSpan>
 				</div>
 			</EF:EFRegion>