2024-09-29 委外加工优化调整

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

@@ -49,7 +49,7 @@ public class ServiceHGSC010 extends ServiceEPBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "委托加工", operType = "查询", operDesc = "查询")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "查询", operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
@@ -65,7 +65,7 @@ public class ServiceHGSC010 extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "委托加工", operType = "删除", operDesc = "删除操作")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "删除", operDesc = "删除操作")
     @Override
     public EiInfo delete(EiInfo inInfo) {
         int i = 0;
@@ -89,7 +89,7 @@ public class ServiceHGSC010 extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "委托加工", operType = "保存", operDesc = "保存操作")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "保存", operDesc = "保存操作")
     public EiInfo save(EiInfo inInfo){
         try {
             List<Map> resultMaps = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -120,7 +120,7 @@ public class ServiceHGSC010 extends ServiceEPBase {
         DaoUtils.update(HGSC010.UPDATE, hgsc010);
     }
 
-    @OperationLogAnnotation(operModul = "委托加工", operType = "提交", operDesc = "提交操作")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "提交", operDesc = "提交操作")
     public EiInfo updateStatus(EiInfo inInfo) {
         int i = 0;
         try {

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

@@ -61,7 +61,7 @@ public class ServiceHGSC010A extends ServiceEPBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "委托加工", operType = "查询", operDesc = "查询")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "查询", operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
@@ -74,7 +74,7 @@ public class ServiceHGSC010A extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "委托加工", operType = "删除", operDesc = "删除操作")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "删除", operDesc = "删除操作")
     @Override
     public EiInfo delete(EiInfo inInfo) {
         int i = 0;
@@ -94,7 +94,7 @@ public class ServiceHGSC010A extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "委托加工", operType = "保存", operDesc = "保存操作")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "保存", operDesc = "保存操作")
     public EiInfo save(EiInfo inInfo){
         try {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);

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

@@ -60,7 +60,7 @@ public class ServiceHGSC010B extends ServiceEPBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "委托加工", operType = "查询", operDesc = "查询")
+    @OperationLogAnnotation(operModul = "委外加工", operType = "查询", operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
@@ -72,7 +72,7 @@ public class ServiceHGSC010B extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "市场调研-需求调研",operType = "删除",operDesc = "删除操作")
+    @OperationLogAnnotation(operModul = "委外加工",operType = "删除",operDesc = "删除操作")
     @Override
     public EiInfo delete(EiInfo inInfo) {
         int i = 0;
@@ -92,12 +92,12 @@ public class ServiceHGSC010B extends ServiceEPBase {
         return inInfo;
     }
 
-    @OperationLogAnnotation(operModul = "市场调研-需求调研",operType = "保存",operDesc = "操作")
+    @OperationLogAnnotation(operModul = "委外加工",operType = "保存",operDesc = "操作")
     public EiInfo save(EiInfo inInfo) {
         try {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);
             HGSC010 hgsc010 = HGSCTools.Hgsc010.getById(Long.parseLong(queryMap.get("parentId").toString()));
-            AssertUtils.isTrue(hgsc010.getSubStatus().equals(CommonConstant.YesNo.YES_1), "当前委托任务已提交，不允许修改保存!");
+            AssertUtils.isTrue(hgsc010.getSubStatus().equals(CommonConstant.YesNo.YES_1), "当前委外任务已提交，不允许修改保存!");
             List<Map> resultRows = inInfo.getBlock(CommonConstant.Field.DETAIL).getRows();
             // 写入数据
             for (Map resultRow : resultRows) {

src/main/webapp/HG/SC/HGSC010.js

@@ -102,7 +102,7 @@ function showFunc(companyCode,companyName,parentId,contractCode) {
             "&inqu_status-0-companyName=" + companyName +
             "&inqu_status-0-parentId=" + parentId +
             "&inqu_status-0-contractCode="+ contractCode,
-        title: "<div style='text-align: center;'>委托详情</div>",
+        title: "<div style='text-align: center;'>委外详情</div>",
         width: "90%",
         height: "80%",
     });
@@ -157,7 +157,7 @@ function updateStatus() {
     $.each(rows, function (index, item) {
         let subStatus = item.get("subStatus");
         if (subStatus == '1') {
-            message("选中的第" + (index + 1) + "行\"委托任务已提交\"，不能重复提交!");
+            message("选中的第" + (index + 1) + "行\"委外任务已提交\"，不能重复提交!");
             flag = false;
             return false;
         }

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

@@ -18,16 +18,16 @@
 <script>
     var ctx = "${ctx}";
 </script>
-<EF:EFPage  title="委托加工">
+<EF:EFPage  title="委外加工">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
-            <EF:EFDatePicker blockId="inqu_status" row="0" ename="contractDate" cname="委托加工日期" role="date"
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="contractDate" cname="委外加工日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
-            <EF:EFInput blockId="inqu_status" row="0" ename="contractCode" cname="委托单号" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="contractCode" cname="委外单号" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="supCode" cname="供应商名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="sup_record_block_id" textField="textField" valueField="valueField"/>
@@ -63,9 +63,9 @@
                 <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="companyName" cname="公司名称"  hidden="true"/>
-            <EF:EFColumn ename="contractDate" cname="委托日期" width="120" enable="true" readonly="false" align="center" editType="date"
+            <EF:EFColumn ename="contractDate" cname="委外加工日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
-            <EF:EFColumn ename="contractCode" cname="委托单号" width="120" enable="false" readonly="false" align="center"/>
+            <EF:EFColumn ename="contractCode" cname="委外单号" width="120" enable="false" readonly="false" align="center"/>
             <EF:EFComboColumn ename="supCode" cname="供应商名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"

src/main/webapp/HG/SC/HGSC010A.js

@@ -220,22 +220,4 @@ let saveDetail = function (btnNode) {
 
 };
 
-function updateStatus(id,status) {
-    let inEiInfo = new EiInfo();
-    inEiInfo.set("result-0-id", id);
-    inEiInfo.set("result-0-status", status);
-    EiCommunicator.send('HGSC009', 'updateStatus', inEiInfo, {
-            onSuccess(response) {
-                NotificationUtil(response.msg);
-                query();
-            },
-            onFail(errorMessage, status, e) {
-                NotificationUtil("执行失败！", "error");
-            }
-        }, {
-            async: false
-        }
-    );
-}
-
 

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

@@ -14,13 +14,13 @@
 <script>
     var ctx = "${ctx}";
 </script>
-<EF:EFPage  title="委托加工">
+<EF:EFPage  title="委外加工">
 
     <EF:EFRegion id="result" title="成本信息">
         <EF:EFInput blockId="inqu_status" row="0" ename="parentId" cname="委托ID" type="hidden"/>
         <EF:EFInput blockId="inqu_status" row="0" ename="companyCode" cname="公司编码" type="hidden"/>
         <EF:EFInput blockId="inqu_status" row="0" ename="companyName" cname="公司名称" type="hidden"/>
-        <EF:EFInput blockId="inqu_status" row="0" ename="contractCode" cname="委托单号" type="hidden"/>
+        <EF:EFInput blockId="inqu_status" row="0" ename="contractCode" cname="委外单号" type="hidden"/>
 
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" needAuth="false">
             <EF:EFColumn ename="id" primaryKey="true" cname="内码" hidden="true"/>