Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev

src/main/java/com/baosight/hpjx/hp/kc/tools/CKExcelTools.java

 package com.baosight.hpjx.hp.kc.tools;
 
 import com.baosight.hpjx.hp.kc.domain.HPKC004;
-import com.baosight.hpjx.hp.pz.tools.HPPZTools;
 import com.baosight.hpjx.util.DateUtils;
 import com.baosight.hpjx.util.ExcelUtils;
 import com.baosight.hpjx.util.MapUtils;
@@ -21,9 +20,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.PageContext;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -225,7 +225,8 @@ public class ServiceHPSC005A extends ServiceBase {
 				// 更新订单主表数量
 				HPSCTools.checkAssignedNum(dbSc005.getProductionOrderNo(), dbSc005.getNum());
 				// 写入子表数据
-				newSc005a.setProdTaskNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROD_TASK_NO));
+				newSc005a.setProdTaskNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROD_TASK_NO,
+						new String[]{dbSc005.getProductionOrderNo()}));
 				newSc005a.setProdOrderNo(dbSc005.getProductionOrderNo());
 				newSc005a.setNum(dbSc005.getNum());
 				newSc005a.setTotalWt(newSc005a.getNum().multiply(dbSc005.getUnitWt()));

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC002A.xml

@@ -37,23 +37,8 @@
 		<isNotEmpty prepend=" AND " property="docId">
             A.DOC_ID = #docId#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdBy">
-            A.CREATED_BY = #createdBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdName">
-            A.CREATED_NAME = #createdName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="createdTime">
-            A.CREATED_TIME = #createdTime#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedBy">
-            A.UPDATED_BY = #updatedBy#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedName">
-            A.UPDATED_NAME = #updatedName#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="updatedTime">
-            A.UPDATED_TIME = #updatedTime#
+        <isNotEmpty prepend=" AND " property="docName">
+            B.DOC_NAME LIKE CONCAT('%', #docName#, '%')
         </isNotEmpty>
 	</sql>
 
@@ -69,7 +54,7 @@
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="order">
-                $orderBy$
+                $order$
             </isNotEmpty>
             <isEmpty property="order">
                 A.ID DESC

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml

@@ -99,7 +99,7 @@
     <sql id="order">
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="order">
-                $orderBy$
+                $order$
             </isNotEmpty>
             <isEmpty property="order">
                 ID ASC

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

@@ -11,7 +11,7 @@
 		<div class="row">
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
 			<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
-			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" readonly="true"/>
+			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
 			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
 			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">

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

@@ -18,10 +18,15 @@ $(function () {
 		columns: [{
 			field: "operator",
 			template: function (item) {
+				let status = item.status;
 				let prodOrderNo = item.productionOrderNo;
 				let filePath1 = item.filePath1;
-				let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+				let template = '';
+				// 非全部派工时展示拆单派工按钮
+				if (status != 2) {
+					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 						+ 'onclick="tearAssign(\'' + prodOrderNo + '\')"  >拆单派工</a>';
+				}
 				template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 					+ 'onclick="showGroupDetail(\'' + prodOrderNo + '\')"  >详情</a>';
 				if (filePath1) {
@@ -51,7 +56,7 @@ function tearAssign(prodOrderNo) {
 		href: "HPSC005A?methodName=initLoad&inqu_status-0-prodOrderNo=" + prodOrderNo,
 		title: "<div style='text-align: center;'>拆单派工</div>",
 		width: "80%",
-		height: "80%",
+		height: "90%",
 		callbackName: tearAssignCallback
 	});
 }

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

@@ -7,7 +7,7 @@ $(function () {
 		        pageSizes: [10, 20, 50, 70, 100],
 	        },
 	        columns: [{
-		        field: "factoryName",
+		        field: "orgName",
 		        attributes: {
 			        class: "i-input-readonly"
 		        }

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

@@ -37,17 +37,17 @@
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="任务ID" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="prodTaskNo" cname="任务单号" enable="false" hidden="true"/>
-			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" hidden="true"/>
-			<EF:EFPopupColumn ename="factoryName" cname="厂区" width="200" align="center" popupType="ServiceGrid"
-			                  popupTitle="厂区信息" serviceName="HPPZ011" methodName="queryComboBoxAll"
+			<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>
+			<EF:EFPopupColumn ename="orgName" cname="生产组" width="200" align="center" popupType="ServiceGrid"
+			                  popupTitle="生产组信息" serviceName="HPPZ011" methodName="queryComboBoxAll"
 			                  resultId="factory_group_ecord_block_id"
 			                  columnEnames="textField,param2Field"
 			                  columnCnames="厂区,生产组"
 			                  backFillColumnIds="param2Field,param1Field,valueField,textField"
 			                  backFillFieldIds="orgName,orgNo,factoryCode,factoryName"
 			                  valueField="textField" textField="textField" readonly="true" required="true"/>
-			<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>
-			<EF:EFColumn ename="orgName" cname="生产组" enable="false" align="center"/>
+			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" hidden="true"/>
+			<EF:EFColumn ename="factoryName" cname="厂区" enable="false" align="center"/>
 			<EF:EFColumn ename="num" cname="分派数量" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="totalWt" cname="分派重量" enable="false" format="{0:N3}"/>
 			<EF:EFColumn ename="completeNum" cname="已完工数量" enable="false" format="{0:N3}"/>

src/main/webapp/XS/OG/XSOG0801.jsp

@@ -102,7 +102,7 @@
     String loginPublicKey = LoginConstants.loginRsaPublicKey;
     String cryptoPasswordEnable = LoginConstants.cryptoPasswordEnable;
 	String companyCode = UserSessionUtils.getCompanyCode();
-	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.getPz009(companyCode).getLoginPrefix();
+	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.HpPz009.getByCode(companyCode).getLoginPrefix();
 %>
 <c:set var="pwdRgx" value="<%=passwordRegex%>"/>
 <c:set var="pwdDesc" value="<%=passwordDesc%>"/>

src/main/webapp/XS/XS3001.jsp

@@ -21,7 +21,7 @@
         request.setAttribute("passwordTip", "密码由不超过255位的英文字母或者数字字符或下划线组成。");
     }
 	String companyCode = UserSessionUtils.getCompanyCode();
-	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.getPz009(companyCode).getLoginPrefix();
+	String loginPrefix = StringUtils.isBlank(companyCode) ? "" : HPPZTools.HpPz009.getByCode(companyCode).getLoginPrefix();
 	String username = UserSession.getUser().getUsername();
     String passwordRegex = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.regex"), "^(?=.*?[a-zA-Z])(?=.*?[0-9]).{1,}$");
     String passwordDesc = StringUtils.defaultIfEmpty(PlatApplicationContext.getProperty("xservices.security.checkpassword.desc"), "密码必须包含英文及数字");