2024-10-19

1.委外加工单详情的材料明细，取消增加功能，增加选择功能，点击选择弹窗显示材料的库存明细，逻辑、限制条件跟生产领料选择仓库的库存
2.成品信息增加字段，为材料编码和材料名称，下拉选择当前材料信息的数据

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

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.common.InventTypeDetailEnum;
+import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.security.UserSessionUtils;
+import com.baosight.hggp.hg.pz.domain.HGPZ004;
+import com.baosight.hggp.hg.sc.domain.HGSC010;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.hg.yx.domain.HGYX001;
+import com.baosight.hggp.hg.yx.domain.HGYX001C;
+import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.exception.PlatException;
+import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/10/19
+ * @description
+ */
+public class ServiceHGSC010C extends ServiceEPBase {
+
+    @Override
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001C.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+            String inventCodes = inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventCodes");
+            if (StringUtils.isNotEmpty(inventCodes)) {
+                String[] specIdArray = inventCodes.split(",");
+                inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventCodes", specIdArray);
+            }
+            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+            inInfo = super.query(inInfo, HGYX001C.QUERY, new HGYX001C());
+            Map<String, Object> queryMap = new HashMap<>();
+            queryMap.put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+            CommonMethod.initBlock(inInfo,
+                    Arrays.asList(
+                            DdynamicEnum.INVENT_TYPE_BLOCK_ID,
+                            DdynamicEnum.INVENT_RECORD_BLOCK_ID,
+                            DdynamicEnum.SPEC_NAME_BLOCK_ID,
+                            DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
+            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+        } catch (Exception e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    /**
+     * 查询
+     *
+     * @param inInfo
+     * @return
+     */
+    @OperationLogAnnotation(operModul = "委外加工", operType = "查询", operDesc = "查询")
+    @Override
+    public EiInfo query(EiInfo inInfo) {
+        try {
+            Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+            queryMap.put(HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
+            queryMap.put(HGPZ004.FIELD_INVENT_TYPE_DETAILS, InventTypeDetailEnum.getProdTypeFour());
+            return super.query(inInfo, HGYX001C.QUERY,new HGYX001C());
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+}

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

+$(function () {
+    // 查询
+    $("#QUERY").on("click", query);
+
+    $("#BNT_CHOICE").on("click", choice)
+})
+
+
+/**
+ * 查询
+ */
+let query = function () {
+    resultGrid.dataSource.page(1);
+}
+
+let choice = function () {
+    let rows = resultGrid.getCheckedRows();
+    if (rows.length < 1) {
+        message("请选择数据");
+        return;
+    }
+    parent.JSColorbox.setValueCallback(rows);
+    parent.JSColorbox.close();
+}
\ No newline at end of file

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

+<%--
+  Created by IntelliJ IDEA.
+  User: 1
+  Date: 2024/10/19
+  Time: 13:12
+  To change this template use File | Settings | File Templates.
+--%>
+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+<script>
+    var ctx = "${ctx}";
+</script>
+<EF:EFPage title="选择委外材料">
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" readonly="true" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
+            </EF:EFSelect>
+            <EF:EFSelect blockId="inqu_status" row="0" ename="whCode" cname="仓库名称" colWidth="3" filter="contains">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFInput blockId="inqu_status" row="0" ename="inventName" cname="物料名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="spec" cname="规格" placeholder="模糊查询" colWidth="3"/>
+        </div>
+    </EF:EFRegion>
+
+    <EF:EFRegion id="result" title="记录集">
+        <EF:EFGrid blockId="result" autoDraw="override"  isFloat="true">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFComboColumn ename="inventType" cname="存货类型" enable="true" width="120" align="center" required="true"
+                              blockName="invent_type_block_id" textField="textField" valueField="valueField"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
+                              filter="contains">
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="inventTypeDetail" cname="存货类型大类" hidden="true"/>
+            <EF:EFComboColumn ename="inventCode" cname="存货编码" enable="true" width="120" align="center" required="true"
+                              blockName="invent_record_block_id" textField="textField" valueField="valueField"
+                              columnTemplate="#=textField#" itemTemplate="#=valueField#-#=textField#" readonly="true"
+                              filter="contains">
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="inventName" cname="存货名称" enable="false" width="120"/>
+            <EF:EFComboColumn ename="spec" cname="规格" enable="true" width="120" align="center" required="true"
+                              blockName="spec_name_block_id" textField="textField" valueField="valueField"
+                              columnTemplate="#=textField#" itemTemplate="#=textField#" readonly="true"
+                              filter="contains">
+            </EF:EFComboColumn>
+            <EF:EFColumn ename="specId" cname="规格ID" width="120" enable="true" readonly="true" align="center" hidden="true" maxLength="50"/>
+            <EF:EFColumn ename="length" cname="长度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="width" cname="宽度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="thick" cname="厚度(MM)" enable="true" readonly="true" width="100" align="right" format="{0:N3}" maxLength="10"/>
+            <EF:EFColumn ename="consQuantity" cname="数量" width="120" enable="true" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right" readonly="true"
+                         data-regex="/^-?[0-9]{1,20}([.][0-9]{1,3})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
+            <EF:EFColumn ename="consUnitWeight" cname="单重(KG)" width="120" enable="true" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right" readonly="true"
+                         data-regex="/^-?[0-9]{1,20}([.][0-9]{1,3})?$/" maxLength="20" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
+            <EF:EFColumn ename="consWeight" cname="重量(KG)" width="120" enable="false" format="{0:N3}" editType="text"
+                         displayType="0.000" sort="true" align="right"
+                         data-regex="/^-?[0-9]{1,15}([.][0-9]{1,3})?$/" maxLength="15" required="true"
+                         data-errorprompt="请输入数字，该值最大可设置15位整数和3位小数！"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>