Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC001.java

@@ -166,7 +166,7 @@ public class ServiceHPKC001 extends ServiceBase {
             HPKC001 fKc001 = new HPKC001();
             fKc001.fromMap(resultRows.get(i));
             AssertUtils.isEmpty(fKc001.getWhCode(), "仓库名称不能为空");
-            AssertUtils.isNull(fKc001.getInventCode(), "存货名称不能为空");
+            AssertUtils.isEmpty(fKc001.getInventCode(), "存货名称不能为空");
             AssertUtils.isNull(fKc001.getInventRecordId(), "规格不能为空");
             AssertUtils.isGt(BigDecimal.ZERO, fKc001.getAmount(), "数量必须大于0");
             AssertUtils.isGt(BigDecimal.ZERO, fKc001.getWeight(), "重量必须大于0");

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

@@ -182,7 +182,7 @@ public class ServiceHPKC006 extends ServiceBase {
 			HPKC006 fKc006 = new HPKC006();
 			fKc006.fromMap(resultRows.get(i));
 			AssertUtils.isEmpty(fKc006.getWhCode(), "仓库名称不能为空");
-			AssertUtils.isNull(fKc006.getInventName(), "存货名称不能为空");
+			AssertUtils.isEmpty(fKc006.getInventName(), "存货名称不能为空");
 			//AssertUtils.isNull(fKc006.getInventRecordId(), "规格不能为空");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc006.getAmount(), "数量必须大于0");
 			AssertUtils.isGt(BigDecimal.ZERO, fKc006.getWeight(), "重量必须大于0");

src/main/java/com/baosight/hpjx/hp/pz/domain/HPPZ004.java

@@ -56,7 +56,9 @@ public class HPPZ004 extends DaoEPBase {
 	public static final String INSERT = "HPPZ004.insert";
 	public static final String UPDATE = "HPPZ004.update";
 	public static final String DELETE = "HPPZ004.delete";
-	
+	public static final String DELETE_BACK = "HPPZ004.deleteBack";
+
+
 	private Long id;
 	private String companyCode = " ";		/* 企业编码 预留*/
 	private String depCode = " ";		/* 部门编码*/

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ004.java

@@ -127,6 +127,10 @@ public class ServiceHPPZ004 extends ServiceBase {
 		HPPZ004 hppz004 = new HPPZ004();
 		if(CollectionUtils.isNotEmpty(list)){
 			hppz004.fromMap(list.get(0));
+			if(hppz004.getDeleteFlag()== CommonConstant.YesNo.YES_1) {
+				hppz004.setDeleteFlag(CommonConstant.YesNo.NO_0);
+				DaoUtils.update(HPPZ004.DELETE_BACK, hppz004);
+			}
 		}else{
 			// 生成编码
 			hppz004.setInventCode(SequenceGenerator.getNextSequence(HPConstant.SequenceId.INVENT_CODE));

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java

@@ -100,7 +100,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 			HPPZ006 fPz006 = new HPPZ006();
 			fPz006.fromMap(resultRows.get(i));
 			AssertUtils.isNull(fPz006.getInventType(), "存货类型不能为空");
-			AssertUtils.isNull(fPz006.getInventCode(), "存货名称不能为空");
+			AssertUtils.isEmpty(fPz006.getInventCode(), "存货名称不能为空");
 			// 去除空格
 			fPz006.setSpec(StringUtils.trimToEmpty(fPz006.getSpec()));
 			// 重复校验

src/main/java/com/baosight/hpjx/hp/pz/sql/HPPZ004.xml

@@ -119,6 +119,11 @@
 		UPDATE hpjx.T_HPPZ004 SET DELETE_FLAG = 1 WHERE ID = #id#
 	</delete>
 
+    <!-- 逻辑删除 -->
+    <delete id="deleteBack">
+        UPDATE hpjx.T_HPPZ004 SET DELETE_FLAG = 0 WHERE ID = #id#
+    </delete>
+
 	<update id="update">
 		UPDATE hpjx.t_hppz004
 		SET

src/main/webapp/HP/SC/HPSC002B.js

@@ -5,7 +5,7 @@ $(function () {
 				field: "operator",
 				template: function (item) {
 					let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-						+ 'href="' + IPLATUI.CONTEXT_PATH + '/EU/DM/EUDM06.jsp?docId=' + item.filePath
+						+ 'href="' + IPLATUI.CONTEXT_PATH + '/EU/DM/EUDM06.jsp?docId=' + item.docId
 						+ '" >附件下载</a>';
 					return template;
 				}

src/main/webapp/HP/ZL/HPZL001.jsp

@@ -23,8 +23,8 @@
 		    </EF:EFSelect>
 		    <EF:EFSelect cname="处理状态" ename="status" blockId="inqu_status" row="0" colWidth="3">
 			    <EF:EFOption label="全部" value=""/>
-			    <EF:EFOption label="1-已处理" value="1"></EF:EFOption>
-			    <EF:EFOption label="0-未处理" value="0"></EF:EFOption>
+			    <EF:EFOption label="已处理" value="1"></EF:EFOption>
+			    <EF:EFOption label="未处理" value="0"></EF:EFOption>
 		    </EF:EFSelect>
 	    </div>
 	    <div class="row">
@@ -43,8 +43,8 @@
 			             required="true"/>
 			<EF:EFColumn ename="checkNo" cname="检查单号" enable="false" width="130" align="center"/>
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="100" align="center">
-				<EF:EFOption label="1-已处理" value="1"></EF:EFOption>
-				<EF:EFOption label="0-未处理" value="0"></EF:EFOption>
+				<EF:EFOption label="已处理" value="1"></EF:EFOption>
+				<EF:EFOption label="未处理" value="0"></EF:EFOption>
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="receiptDate" cname="单据日期" enable="false" width="120" align="center" editType="date"
 			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"/>