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

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

@@ -39,13 +39,13 @@
 			COMPANY_CODE = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
+			PROJ_CODE like  CONCAT('%', #projCode#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			PROJ_NAME = #projName#
+			PROJ_NAME like  CONCAT('%', #projName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productionOrderNo">
-			PRODUCTION_ORDER_NO = #productionOrderNo#
+			PRODUCTION_ORDER_NO  like  CONCAT('%', #productionOrderNo#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtType">
 			PRDT_TYPE = #prdtType#
@@ -57,7 +57,7 @@
 			PRDT_NAME = #prdtName#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planCompletionDate">
-			PLAN_COMPLETION_DATE = #planCompletionDate#
+			PLAN_COMPLETION_DATE like CONCAT('%', #planCompletionDate#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="num">
 			NUM = #num#
@@ -69,10 +69,10 @@
 			STATUS = #status#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orgNo">
-			ORG_NO = #orgNo#
+			ORG_NO  like  CONCAT('%', #orgNo#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orgName">
-			ORG_NAME = #orgName#
+			ORG_NAME  like  CONCAT('%', #orgName#, '%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="createdBy">
 			CREATED_BY = #createdBy#

src/main/webapp/HP/KC/HPKC099.js

 $(function () {
-
     $("#QUERY").on("click", function () {
         resultGrid.dataSource.page(1);
     });
 
     $("#GENERATE").on("click", generateRK);
 
+    $("#inqu_status-0-orgNo").on("click", function () {
+        JSColorbox.open({
+            href: "HPSC098?methodName=initLoad",
+            title: "<div style='text-align: center;'>选择组织</div>",
+            width: "40%",
+            height: "70%",
+            callbackName: getOrgCallback
+        });
+    });
+
     IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,
@@ -29,3 +38,8 @@ let generateRK = function () {
         }
     });
 }
+
+let getOrgCallback = function (orgId) {
+    $("#inqu_status-0-orgNo").val(orgId);
+    JSColorbox.close();
+}
\ No newline at end of file

src/main/webapp/HP/KC/HPKC099.jsp

@@ -16,9 +16,15 @@
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" row="0"/>
             <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产订单号:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产组:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="productionOrderNo" cname="生产订单号:" row="0"/>
+            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" />
+            <EF:EFInput blockId="inqu_status" ename="orgNo" cname="生产组:" row="0"/>
+            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" ename="status" row="0" defaultValue="">
+                <EF:EFOption label="未派工" value="0"/>
+                <EF:EFOption label="已派工" value="1"/>
+            </EF:EFSelect>
         </div>
 <%--        <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
     </EF:EFRegion>
@@ -45,4 +51,4 @@
 <script>
     var ctx = "${ctx}";
 </script>
-<script src="${ctx}/HP/SC/HPKC099.js"></script>
+<script src="${ctx}/HP/KC/HPKC099.js"></script>
\ No newline at end of file

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

@@ -5,6 +5,16 @@ $(function () {
         resultGrid.dataSource.page(1);
     });
 
+    $("#inqu_status-0-orgNo").on("click", function () {
+        JSColorbox.open({
+            href: "HPSC098?methodName=initLoad",
+            title: "<div style='text-align: center;'>选择组织</div>",
+            width: "40%",
+            height: "70%",
+            callbackName: getOrgCallback
+        });
+    })
+
     $("#ASSIGN").on("click", function () {
         //重置全局变量
         ids = [];
@@ -13,7 +23,16 @@ $(function () {
             message("请至少选择一条需要分派的数据");
             return;
         }
-        let num = 0;
+
+        JSColorbox.open({
+            href: "HPSC098?methodName=initLoad",
+            title: "<div style='text-align: center;'>选择组织</div>",
+            width: "40%",
+            height: "70%",
+            callbackName: assignCallback
+        });
+        //分派可修改，不做判断
+        /*let num = 0;
         rows.forEach(function(element) {
             if (element.status == 1) {
                 num++;
@@ -24,14 +43,8 @@ $(function () {
             message("勾选的数据中有已经分派的数据！");
             return;
         } else {
-            JSColorbox.open({
-                href: "HPSC098?methodName=initLoad",
-                title: "<div style='text-align: center;'>选择组织</div>",
-                width: "40%",
-                height: "70%",
-                callbackName: assignCallback
-            });
-        }
+
+        }*/
     });
 
 
@@ -86,4 +99,9 @@ let assignCallback = function (orgId) {
     },{async:false});
 
 
+}
+
+let getOrgCallback = function (orgId) {
+    $("#inqu_status-0-orgNo").val(orgId);
+    JSColorbox.close();
 }
\ No newline at end of file

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

@@ -16,9 +16,11 @@
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
+            <EF:EFInput blockId="inqu_status" ename="projCode" cname="项目号:" row="0"/>
             <EF:EFInput blockId="inqu_status" ename="projName" cname="项目名称:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产订单号:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="projType" cname="生产组:" row="0"/>
+            <EF:EFInput blockId="inqu_status" ename="productionOrderNo" cname="生产订单号:" row="0"/>
+            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期:" row="0" format="yyyy-MM-dd" />
+            <EF:EFInput blockId="inqu_status" ename="orgNo" cname="生产组:" row="0"/>
             <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
                 <EF:EFOption label="未派工" value="0"/>
                 <EF:EFOption label="已派工" value="1"/>