opt:印尼项目优化

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java

@@ -347,79 +347,66 @@ public class PdmBiSubpackagerelation extends Model<PdmBiSubpackagerelation> {
     /**
      * 实际木箱重量
      */
-    @TableField(exist = false)
     private String box_actual_net_weight;
 
     /**
      * 客户木箱唯一序列号
      */
-    @TableField(exist = false)
     private String box_customer_sn;
 
     /**
      * 客户物料号
      */
-    @TableField(exist = false)
     private String customer_material_code;
 
     /**
      * 客户物料名称
      */
-    @TableField(exist = false)
     private String customer_material_desc;
 
     /**
      * 客户要求批号
      */
-    @TableField(exist = false)
     private String customer_batch_number;
 
     /**
      * 子卷的客户卷号
      */
-    @TableField(exist = false)
     private String customer_roll_name;
 
     /**
      * 子卷铝箔袋重量
      */
-    @TableField(exist = false)
     private String roll_package_material_al_weight;
 
     /**
      * 子卷辅材重量
      */
-    @TableField(exist = false)
     private String roll_fc_weight;
 
     /**
      * 子卷备注
      */
-    @TableField(exist = false)
     private String roll_remark;
 
     /**
      * 净重合计
      */
-    @TableField(exist = false)
     private BigDecimal total_net_weight;
 
     /**
      * 净重转换
      */
-    @TableField(exist = false)
     private BigDecimal net_weight_convert;
 
     /**
      * 毛重转换
      */
-    @TableField(exist = false)
     private BigDecimal gross_weight_convert;
 
     /**
      * 质保截止日期
      */
-    @TableField(exist = false)
     private String warranty_expire_date;
     /**
      * 获取主键值

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/IStIvtIostorinvdisService.java

@@ -78,6 +78,13 @@ public interface IStIvtIostorinvdisService extends IService<StIvtIostorinvdis> {
      */
     List<InBillPageVo> getInBillDatasNew(InBillPageParam paramMap);
 
+    /**
+     * 成品入库分页查询3
+     * @param paramMap 参数
+     * @param page 分页数据
+     * @return
+     */
+    IPage<InBillPageVo> getInBillPage3(InBillPageParam paramMap, PageQuery page);
 
     /**
      * 成品出库分页查询

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.java

@@ -75,6 +75,8 @@ public interface StIvtIostorinvdisMapper extends BaseMapper<StIvtIostorinvdis> {
      */
     IPage<InBillPageVo> selectPageLeftJoin(IPage<InBillPageVo> pages, InBillPageParam paramMap);
 
+    IPage<InBillPageVo> selectPageLeftJoin3(IPage<InBillPageVo> pages, InBillPageParam paramMap);
+
     /**
      * 查询成品入库全部分页数据
      * @param pages

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/dao/mapper/StIvtIostorinvdisMapper.xml

@@ -493,16 +493,11 @@
         dis.struct_name,
         mst.bill_type,
         dis.box_no,
-        mater.material_code,
-        mater.material_name,
-        mb.material_name AS box_name,
         dis.pcsn,
         sub.sap_pcsn,
         sub.net_weight,
         dis.qty_unit_name,
         sub.customer_name,
-        cust.sales_owner,
-        cust.cust_name,
         sub.quanlity_in_box,
         sub.customer_description,
         sub.sale_order_name,
@@ -524,13 +519,7 @@
         sub.net_weight_convert,
         sub.gross_weight_convert,
         sub.warranty_expire_date,
-        case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS
-        paper_type,
-        case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then
-        plan.FRP_material end
-        AS paper_code,
-        case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then
-        plan.FRP_description end AS paper_name,
+        replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec,
         sub.thickness,
         sub.box_weight,
         sub.length,
@@ -540,28 +529,9 @@
         sub.demand_limit,
         sub.standard_limit,
         sub.actual_value,
-        (case when plan.parent_container_name <![CDATA[ <> ]]> '' then plan.parent_container_name else
-        plan.restruct_container_name end) AS parent_container_name,
         mst.remark,
-        (case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '08:00:00' AND DATE_FORMAT(
-        mst.confirm_time, '%H:%i:%s' ) <![CDATA[ <= ]]> '19:59:59' then '白班'
-        when ((
-        DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '20:00:00' AND DATE_FORMAT( mst.confirm_time,
-        '%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
-        OR
-        DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '00:00:00' AND DATE_FORMAT( mst.confirm_time,
-        '%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59'
-        )) then '晚班' end) AS classes,
-        CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size,
-        CASE
-
-        WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '08:00:00' AND DATE_FORMAT( mst.confirm_time,
-        '%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
-        THEN mst.confirm_time
-        WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]> '00:00:00' AND DATE_FORMAT( mst.confirm_time,
-        '%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59'
-        THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day)
-        END AS confirm_time_class
+        sub.container_name,
+        CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size
         FROM
         (
         SELECT
@@ -612,28 +582,8 @@
         ) AS c
         LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
         LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
-        --         LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id
-        LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id
         INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn =
         dis.box_no
-        LEFT JOIN md_cs_customerbase cust ON cust.cust_code = sub.customer_name
-        LEFT JOIN (SELECT
-        container_name,
-        MAX(paper_tube_or_FRP) AS paper_tube_or_FRP,
-        MAX(paper_tube_material) AS paper_tube_material,
-        MAX(paper_tube_description) AS paper_tube_description,
-        MAX(paper_tube_model) AS paper_tube_model,
-        MAX(FRP_material) AS FRP_material,
-        MAX(parent_container_name) AS parent_container_name,
-        MAX(restruct_container_name) AS restruct_container_name,
-        MAX(FRP_description) AS FRP_description,
-        MAX(FRP_model) AS FRP_model
-        FROM
-        pdm_bi_slittingproductionplan plan1
-        WHERE
-        plan1.is_delete = '0'
-        GROUP BY container_name) plan ON plan.container_name = sub.container_name
-        LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type
         WHERE
         mst.io_type = '0'
         AND mst.is_delete = '0'
@@ -644,11 +594,161 @@
                 #{code}
             </foreach>
         </if>
-        <if test="paramMap.is_virtual == 0">
-            --             AND sect.sect_type_attr <![CDATA[ <> ]]> '09'
+        <if test="paramMap.product_area != null and !paramMap.product_area.isEmpty()">
+            AND LEFT(sub.container_name,2) IN
+            <foreach collection="paramMap.product_area" item="code" separator="," open="(" close=")">
+                #{code}
+            </foreach>
+            OR SUBSTRING(sub.container_name,2,2) IN
+            <foreach collection="paramMap.product_area" item="code" separator="," open="(" close=")">
+                #{code}
+            </foreach>
         </if>
-        <if test="paramMap.is_virtual == 1">
-            --             AND sect.sect_type_attr = '09'
+        <if test="paramMap.thickness_request != null and paramMap.thickness_request != ''">
+            AND sub.thickness_request = #{paramMap.thickness_request}
+        </if>
+        <if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0001'">
+            AND IFNULL(sub.sub_type,'') = ''
+        </if>
+        <if test="paramMap.sale_order_name != null and paramMap.sale_order_name != ''">
+            AND sub.sale_order_name = #{paramMap.sale_order_name}
+        </if>
+        <if test="paramMap.sap_pcsn != null and paramMap.sap_pcsn != ''">
+            AND sub.sap_pcsn = #{paramMap.sap_pcsn}
+        </if>
+        <if test="paramMap.bill_type != null and paramMap.bill_type != '' and paramMap.bill_type == '0007'">
+            AND sub.sub_type = '2'
+        </if>
+        <if test="paramMap.begin_time != null and paramMap.begin_time != ''">
+            AND mst.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
+        </if>
+        <if test="paramMap.end_time != null and paramMap.end_time != ''">
+            AND mst.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
+        </if>
+        <if test="paramMap.with != null and paramMap.with != ''">
+            AND CONCAT( sub.thickness_request,'*',sub.width) = #{paramMap.with}
+        </if>
+        <if test="paramMap.classes == 1">
+            AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'08:00:00' AND DATE_FORMAT( mst.confirm_time,
+            '%H:%i:%s' ) <![CDATA[ <= ]]> '19:59:59'
+        </if>
+        <if test="paramMap.classes == 2">
+            AND (DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'20:00:00' AND DATE_FORMAT( mst.confirm_time,
+            '%H:%i:%s' ) <![CDATA[ <= ]]> '23:59:59'
+            OR
+            DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <![CDATA[ >= ]]>'00:00:00' AND DATE_FORMAT( mst.confirm_time,
+            '%H:%i:%s' ) <![CDATA[ <= ]]> '07:59:59')
+        </if>
+        ORDER BY mst.confirm_time DESC, dis.box_no
+    </select>
+    <select id="selectPageLeftJoin3" resultType="org.nl.wms.stat.service.vo.InBillPageVo">
+        SELECT
+        mst.stor_name,
+        dis.sect_name,
+        dis.struct_code,
+        dis.struct_name,
+        mst.bill_type,
+        dis.box_no,
+        dis.pcsn,
+        sub.sap_pcsn,
+        sub.net_weight,
+        dis.qty_unit_name,
+        sub.customer_name,
+        sub.quanlity_in_box,
+        sub.customer_description,
+        sub.sale_order_name,
+        mst.input_time,
+        mst.confirm_time,
+        sub.date_of_production,
+        mst.input_optname,
+        sub.width,
+        sub.box_actual_net_weight,
+        sub.box_customer_sn,
+        sub.customer_material_code,
+        sub.customer_material_desc,
+        sub.customer_batch_number,
+        sub.customer_roll_name,
+        sub.roll_package_material_al_weight,
+        sub.roll_fc_weight,
+        sub.roll_remark,
+        sub.total_net_weight,
+        sub.net_weight_convert,
+        sub.gross_weight_convert,
+        sub.warranty_expire_date,
+        sub.thickness,
+        sub.box_weight,
+        sub.length,
+        sub.thickness_request,
+        sub.width_standard,
+        sub.mass_per_unit_area,
+        sub.demand_limit,
+        sub.standard_limit,
+        sub.actual_value,
+        mst.remark,
+        sub.container_name,
+        replace(CONCAT( sub.thickness_request, '*', sub.width_standard ),'.0','') AS spec,
+        CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size
+        FROM
+        (
+        SELECT
+        MIN( a.iostorinvdis_id ) AS iostorinvdis_id
+        FROM
+        st_ivt_iostorinvdis a
+        LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
+        WHERE
+        b.io_type = '0'
+        <if test="paramMap.bill_type != null and paramMap.bill_type != ''">
+            AND b.bill_type = #{paramMap.bill_type}
+        </if>
+        <if test="paramMap.pcsn != null and paramMap.pcsn != ''">
+            AND a.pcsn = #{paramMap.pcsn}
+        </if>
+        <if test="paramMap.begin_time != null and paramMap.begin_time != ''">
+            AND b.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
+        </if>
+        <if test="paramMap.end_time != null and paramMap.end_time != ''">
+            AND b.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
+        </if>
+        AND b.bill_status = '99'
+        GROUP BY
+        pcsn
+        UNION
+        SELECT
+        MIN( a.iostorinvdis_id ) AS iostorinvdis_id
+        FROM
+        st_ivt_iostorinvdis a
+        LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
+        WHERE
+        b.io_type = '0'
+        <if test="paramMap.new_bill_type != null and paramMap.new_bill_type != ''">
+            AND b.bill_type = #{paramMap.new_bill_type}
+        </if>
+        <if test="paramMap.pcsn != null and paramMap.pcsn != ''">
+            AND a.pcsn = #{paramMap.new_bill_type}
+        </if>
+        <if test="paramMap.begin_time != null and paramMap.begin_time != ''">
+            AND b.confirm_time <![CDATA[ >= ]]> #{paramMap.begin_time}
+        </if>
+        <if test="paramMap.end_time != null and paramMap.end_time != ''">
+            AND b.confirm_time <![CDATA[ <= ]]> #{paramMap.end_time}
+        </if>
+        AND b.bill_status = '99'
+        GROUP BY
+        pcsn
+        ) AS c
+        LEFT JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
+        LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
+        INNER JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn =
+        dis.box_no
+        WHERE
+        mst.io_type = '0'
+        AND mst.is_delete = '0'
+        AND mst.bill_status = '99'
+        <if test="paramMap.stor_id != null and !paramMap.stor_id.isEmpty()">
+            AND mst.stor_id IN
+            <foreach collection="paramMap.stor_id" item="code" separator="," open="(" close=")">
+                #{code}
+            </foreach>
         </if>
         <if test="paramMap.product_area != null and !paramMap.product_area.isEmpty()">
             AND LEFT(sub.container_name,2) IN

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvdisServiceImpl.java

@@ -248,11 +248,32 @@ public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisM
             paramMap.setBegin_time(today_begin_time);
             paramMap.setEnd_time(today_end_time);
         }
-        if ("0".equals(paramMap.getIs_all())) {
-            return stIvtIostorinvdisMapper.getInBillDataNew(paramMap);
-        } else {
-            return stIvtIostorinvdisMapper.getInBillAllData(paramMap);
+         return stIvtIostorinvdisMapper.getInBillDataNew(paramMap);
+    }
+
+    @Override
+    public IPage<InBillPageVo> getInBillPage3(InBillPageParam paramMap, PageQuery page) {
+        String begin_time = paramMap.getBegin_time();
+        String end_time = paramMap.getEnd_time();
+        if (ObjectUtil.isNotEmpty(paramMap.getBill_type())) {
+            paramMap.setNew_bill_type("0001".equals(paramMap.getBill_type()) ? "0007" : "-1");
         }
+        // 处理时间
+        if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) {
+            String begin_time_today = begin_time.substring(0, 10);
+            String end_time_today = end_time.substring(0, 10);
+            // 开始时间
+            String today_begin_time = begin_time_today + " 08:00:00";
+            // 结束时间：19:59:59
+            DateTime parse = DateUtil.parse(end_time_today);
+            String substring = DateUtil.offsetDay(parse, 1).toString().substring(0, 10);
+            String today_end_time = substring + " 07:59:59";
+            paramMap.setBegin_time(today_begin_time);
+            paramMap.setEnd_time(today_end_time);
+        }
+        IPage<InBillPageVo> pages = new Page<>(page.getPage() + 1, page.getSize());
+        pages = stIvtIostorinvdisMapper.selectPageLeftJoin3(pages, paramMap);
+        return pages;
     }
 
 

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -1461,9 +1461,13 @@ public class MesToLmsServiceImpl implements MesToLmsService {
 
                 PdmBiSubpackagerelation pdmBiSubpackagerelationUpdate = new PdmBiSubpackagerelation();
                 if (StrUtil.equals(BoxWeight, "0")) {
+                    pdmBiSubpackagerelationUpdate.setTotal_net_weight(total_net_weight);
+                    pdmBiSubpackagerelationUpdate.setNet_weight_convert(WeightUnitConverterUtil.convertKgToLbm(total_net_weight,2,RoundingMode.HALF_UP));
                     pdmBiSubpackagerelationUpdate.setBox_weight(NumberUtil.toBigDecimal(BoxWeight2));
                     pdmBiSubpackagerelationUpdate.setGross_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(BoxWeight2),2,RoundingMode.HALF_UP));
                 } else {
+                    pdmBiSubpackagerelationUpdate.setTotal_net_weight(NumberUtil.toBigDecimal(NetWeight));
+                    pdmBiSubpackagerelationUpdate.setNet_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(NetWeight),2,RoundingMode.HALF_UP));
                     pdmBiSubpackagerelationUpdate.setBox_weight(NumberUtil.toBigDecimal(BoxWeight));
                     pdmBiSubpackagerelationUpdate.setGross_weight_convert(WeightUnitConverterUtil.convertKgToLbm(NumberUtil.toBigDecimal(BoxWeight),2,RoundingMode.HALF_UP));
                 }

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation;
 import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelationrecord;
 import org.nl.b_lms.pdm.subpackagerelation.service.IPdmBiSubpackagerelationrecordService;
@@ -156,6 +157,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             paramMap.setVbeln("");
             paramMap.setFlag("1");
         }
+        if (StringUtils.isNotBlank(paramMap.getBox_no())) {
+            paramMap.setFlag("1");
+        }
         //获取人员对应的仓库
         List<String> storIds = bsrealstorattrService.getStoreForUser(SecurityUtils.getCurrentUserId());
         paramMap.setIn_stor_id(storIds);

lms/nladmin-system/src/main/java/org/nl/wms/stat/rest/InBillQueryController.java

@@ -46,6 +46,12 @@ public class InBillQueryController {
         return new ResponseEntity<>(TableDataInfo.build(inBillQueryService.getPage2(whereJson, page)), HttpStatus.OK);
     }
 
+    @GetMapping(value = "/query3")
+    @Log("新查询3")
+    public ResponseEntity<Object> query3(InBillPageParam whereJson, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(inBillQueryService.getPage3(whereJson, page)), HttpStatus.OK);
+    }
+
     @Log("导出数据")
     @GetMapping(value = "/download")
     public void download(@RequestParam Map map, HttpServletResponse response, String[] product_area) throws IOException {

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/InBillQueryService.java

@@ -66,6 +66,8 @@ public interface InBillQueryService {
 
     IPage<InBillPageVo> getPage2(InBillPageParam whereJson, PageQuery page);
 
+    IPage<InBillPageVo> getPage3(InBillPageParam whereJson, PageQuery page);
+
     /**
      *
      * @param whereJson

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java

@@ -190,6 +190,11 @@ public class InBillQueryServiceImpl implements InBillQueryService {
         return iostorinvdisService.getInBillPage(whereJson, page);
     }
 
+    @Override
+    public IPage<InBillPageVo> getPage3(InBillPageParam whereJson, PageQuery page) {
+        return iostorinvdisService.getInBillPage3(whereJson, page);
+    }
+
     @Override
     public List<PointDto> queryAll(Map whereJson) {
         WQLObject wo = WQLObject.getWQLObject("sch_base_point");
@@ -662,32 +667,31 @@ public class InBillQueryServiceImpl implements InBillQueryService {
             for (int i = 0; i < inBillPageVos.size(); i++) {
                 InBillPageVo billPageVo = inBillPageVos.get(i);
                 Map<String, Object> mp = new LinkedHashMap<>();
-                mp.put("成品卷号", billPageVo.getParent_container_name());
-                mp.put("入库日期", billPageVo.getConfirm_time());
-                mp.put("装箱日期", billPageVo.getDate_of_production().replace("-", "/"));
-                mp.put("客户名称", billPageVo.getCust_name());
+                mp.put("成品卷号 \nSub-roll number", billPageVo.getContainer_name());
+                mp.put("入库日期\nWarehousing date", billPageVo.getConfirm_time());
+                mp.put("装箱日期\nPacking date", billPageVo.getDate_of_production().replace("-", "/"));
+                mp.put("客户名称\nCustomer name", billPageVo.getCustomer_description());
                 try {
-                    mp.put("订单号", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-")));
+                    mp.put("订单号\nPO number", billPageVo.getSale_order_name().substring(0, billPageVo.getSale_order_name().indexOf("-")));
                 } catch (Exception e) {
-                    mp.put("订单号", billPageVo.getSale_order_name());
+                    mp.put("订单号\nPO number", billPageVo.getSale_order_name());
                 }
-                mp.put("批号", billPageVo.getCustomer_batch_number());
-                mp.put("物料号", billPageVo.getCustomer_material_code());
-                mp.put("箱号", billPageVo.getBox_no());
-                mp.put("客户箱号/序列号", billPageVo.getBox_customer_sn() );
-                mp.put("客户卷号", billPageVo.getCustomer_roll_name());
-                mp.put("客户要求厚度", billPageVo.getThickness_request());
-                mp.put("客户要求幅宽", String.format("%.0f", Double.parseDouble(billPageVo.getWidth_standard())));
-               //怎么取 现在还不明确
-                mp.put("规格", billPageVo.getThickness_request());
-                mp.put("子卷净重",  NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1));
-                mp.put("米数（长度）", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1));
-                mp.put("净重合计",billPageVo.getTotal_net_weight());
-                mp.put("毛重合计", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1));
-                mp.put("备注", "");
-                mp.put("净重转换",billPageVo.getNet_weight_convert());
-                mp.put("毛重转换",billPageVo.getGross_weight_convert());
-                mp.put("质保截止日期",billPageVo.getWarranty_expire_date());
+                mp.put("批号\nBatch number", billPageVo.getCustomer_batch_number());
+                mp.put("物料号\nMaterial number", billPageVo.getCustomer_material_code());
+                mp.put("箱号\nBox number", billPageVo.getBox_no());
+                mp.put("客户箱号/序列号\nCustomer Box number/Serial number", billPageVo.getBox_customer_sn() );
+                mp.put("客户卷号\nCustomer Roll Number", billPageVo.getCustomer_roll_name());
+                mp.put("客户要求厚度\n", billPageVo.getThickness_request());
+                mp.put("客户要求幅宽\n", billPageVo.getWidth_standard());
+                mp.put("规格\nSpec",  billPageVo.getSpec());
+                mp.put("子卷净重\nRoll net weight",  NumberUtil.round(StrUtil.isEmpty(billPageVo.getNet_weight()) ? "0" : billPageVo.getNet_weight(), 1));
+                mp.put("米数（长度）\nLength", NumberUtil.round(StrUtil.isEmpty(billPageVo.getLength()) ? "0" : billPageVo.getLength(), 1));
+                mp.put("净重合计\nTotal net weight",billPageVo.getTotal_net_weight());
+                mp.put("毛重合计\nTotal gross weight", NumberUtil.round(StrUtil.isEmpty(billPageVo.getBox_weight()) ? "0" : billPageVo.getBox_weight(), 1));
+                mp.put("备注\n", billPageVo.getRoll_remark());
+                mp.put("净重转换\nnet weight convert",billPageVo.getNet_weight_convert());
+                mp.put("毛重转换\ngross weight convert",billPageVo.getGross_weight_convert());
+                mp.put("质保截止日期\n",billPageVo.getWarranty_expire_date());
                 list.add(mp);
             }
 

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/vo/InBillPageVo.java

@@ -88,5 +88,6 @@ public class InBillPageVo {
     private String net_weight_convert;
     private String gross_weight_convert;
     private String warranty_expire_date;
-
+    private String container_name;
+    private String spec;
 }

lms/nladmin-system/src/main/resources/language/i18n/en.js

@@ -49,6 +49,8 @@ var config = {
         "mesErrorTitle": "MES Error"
     },
     "common": {
+        "warranty_expire_date":"warranty expire date",
+        "spec": "Specification",
         "warehousing_time": "Warehousing Time",
         "stock_age": "Stock Age",
         "produce_age": "Production Duration (Days)",
@@ -573,6 +575,19 @@ var config = {
         "pleaseSelectBusinessType": "Please select business type!",
         "pleaseSelectWarehouse": "Please select warehouse!",
         "doNotAllowAddingSameMaterial": "Adding the same material is not allowed!",
+        "instorgeDate": "Inbound Date",
+        "materialNumber": "Material Number",
+        "customerBoxNumber": "Customer Box Number/Serial Number",
+        "customerRollNumber": "Customer Roll Number",
+        "customerRequiredThickness": "Customer Required Thickness",
+        "subRollNetWeight": "Sub-Roll Net Weight",
+        "meterage": "Meterage (Length)",
+        "totalNetWeight": "Total Net Weight",
+        "totalGrossWeight": "Total Gross Weight",
+        "packingDate": "Packing Date",
+        "netWeightConvert": "Net Weight Conversion",
+        "grossWeightConvert": "Gross Weight Conversion",
+        "finishedProductRollNumber": "Finished Product Roll Number",
         "outStorIdCannotBeEmpty": "Transfer in warehouse cannot be empty!"
     },
     "task": {
@@ -2820,7 +2835,9 @@ var config = {
         "update_name": "Modifier",
         "update_time": "Update Time",
         "ext_id": "External ID",
-        "top_dept": "Top Department"
+        "top_dept": "顶级部门",
+        "parent_dept":"上级部门",
+        "select_dept_category":"选择部门类目"
     },
     "sys_dict": {
         "code": "Code",

lms/nladmin-system/src/main/resources/language/i18n/id.js

@@ -48,6 +48,8 @@ var config = {
         "load_text5": "Hanya dapat mengunggah satu file excel!"
     },
     "common": {
+        "warranty_expire_date":"Tanggal Berakhir Garansi",
+        "spec": "Spesifikasi",
         "warehousing_time": "Waktu Pemasukan Gudang",
         "stock_age": "Usia Inventaris",
         "produce_age": "Durasi Produksi (hari)",
@@ -572,6 +574,19 @@ var config = {
         "pleaseSelectBusinessType": "Silakan pilih jenis bisnis!",
         "pleaseSelectWarehouse": "Silakan pilih gudang!",
         "doNotAllowAddingSameMaterial": "Tidak boleh menambahkan material yang sama!",
+        "instorgeDate": "Tanggal Masuk Gudang",
+        "materialNumber": "Nomor Material",
+        "customerBoxNumber": "Nomor Kotak/Nomor Seri Pelanggan",
+        "customerRollNumber": "Nomor Gulungan Pelanggan",
+        "customerRequiredThickness": "Ketebalan yang Diminta Pelanggan",
+        "subRollNetWeight": "Berat Bersih Sub-Gulungan",
+        "meterage": "Meteran (Panjang)",
+        "totalNetWeight": "Total Berat Bersih",
+        "totalGrossWeight": "Total Berat Kotor",
+        "packingDate": "Tanggal Pengepakan",
+        "netWeightConvert": "Konversi Berat Bersih",
+        "grossWeightConvert": "Konversi Berat Kotor",
+        "finishedProductRollNumber": "Nomor Gulungan Produk Jadi",
         "outStorIdCannotBeEmpty": "Gudang masuk tidak boleh kosong!"
     },
     "task": {
@@ -2814,9 +2829,11 @@ var config = {
         "is_used": "Status",
         "name": "Nama",
         "pid": "Departemen Atasan",
-        "sub_count": "Jumlah Sub Departemen",
         "update_name": "Pengubah",
-        "update_time": "Waktu Pembaruan"
+        "update_time": "Waktu Pembaruan",
+        "top_dept": "Departemen Puncak",
+        "parent_dept": "Departemen Induk",
+        "select_dept_category": "Pilih Kategori Departemen"
     },
     "sys_dict": {
         "code": "Kode",

lms/nladmin-system/src/main/resources/language/i18n/zh.js

@@ -93,6 +93,8 @@ var config = {
         "correspondingDeepLocationError": "对应的深货位错误!"
     },
     "common": {
+        "warranty_expire_date":"质保截止日期",
+        "spec":"规格",
         "warehousing_time":"入库时间",
         "stock_age":"库龄",
         "produce_age":"生产时长（天）",
@@ -617,7 +619,20 @@ var config = {
         "pleaseSelectBusinessType": "请选择业务类型！",
         "pleaseSelectWarehouse": "请选择仓库！",
         "doNotAllowAddingSameMaterial": "不允许添加相同物料！",
-        "outStorIdCannotBeEmpty": "移入仓库不能为空！"
+        "outStorIdCannotBeEmpty": "移入仓库不能为空！",
+        "instorgeDate": "入库日期",
+        "materialNumber": "物料号",
+        "customerBoxNumber": "客户箱号/序列号",
+        "customerRollNumber": "客户卷号",
+        "customerRequiredThickness": "客户要求厚度",
+        "subRollNetWeight": "子卷净重",
+        "meterage": "米数（长度）",
+        "totalNetWeight": "净重合计",
+        "totalGrossWeight": "毛重合计",
+        "packingDate": "装箱日期",
+        "netWeightConvert": "净重转换",
+        "grossWeightConvert": "毛重转换",
+        "finishedProductRollNumber": "成品卷号"
     },
     "task": {
         "status": {
@@ -2864,7 +2879,9 @@ var config = {
         "update_name": "修改者",
         "update_time": "更新时间",
         "ext_id": "外部标识",
-        "top_dept": "顶级部门"
+        "top_dept": "顶级部门",
+        "parent_dept":"上级部门",
+        "select_dept_category":"选择部门类目"
     },
     "sys_dict": {
         "code": "编码",

lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue

@@ -459,7 +459,7 @@ export default {
           data.end_time = this.crud.query.createTime[1]
         }
         this.showDtlLoading = true
-        download('/api/in/InQuery/download3', data).then(result => {
+        download('/api/in/InQuery/download2', data).then(result => {
           downloadFile(result, '成品入库查询', 'xlsx')
           this.showDtlLoading = false
         }).catch(() => {

lms/nladmin-ui/src/views/wms/stat/inbillquery/index3.vue

@@ -0,0 +1,412 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-form
+          :inline="true"
+          class="demo-form-inline"
+          label-position="right"
+          label-width="90px"
+          label-suffix=":"
+        >
+          <el-form-item :label="$t('common.stor_name')">
+            <el-select
+              v-model="query.stor_id"
+              clearable
+              collapse-tags
+              multiple
+              size="mini"
+              :placeholder="$t('common.Please_select')"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in storlist"
+                :key="item.stor_id"
+                :label="item.stor_name"
+                :value="item.stor_id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('st_ivt_structivtchange.buss_type')">
+            <el-select
+              v-model="query.bill_type"
+              clearable
+              filterable
+              size="mini"
+              :placeholder="$t('st_ivt_structivtchange.buss_type')"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.ST_INV_IN_TYPE"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item :label="$t('st_ivt_coolpointivt.instorage_time')">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :start-placeholder="$t('common.startDate')"
+              :end-placeholder="$t('common.endDate')"
+              :default-time="['00:00:00', '23:59:59']"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('common.width')">
+            <el-input
+              v-model="query.with"
+              size="mini"
+              clearable
+              placeholder="例如：8*868"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('common.thickness')">
+            <el-input
+              v-model="query.thickness_request"
+              size="mini"
+              clearable
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('common.container_name')">
+            <el-input
+              v-model="query.pcsn"
+              size="mini"
+              clearable
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label-width="120" :label="$t('pdm_bi_containerinfo.sale_order_name')">
+            <el-input
+              v-model="query.sale_order_name"
+              size="mini"
+              clearable
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('common.product_area')">
+            <el-select
+              v-model="query.product_area"
+              clearable
+              multiple
+              size="mini"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item :label="$t('status.virtual_warehouse')">
+            <el-select
+              v-model="query.is_virtual"
+              clearable
+              size="mini"
+              :placeholder="$t('common.Please_select')"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('st_ivt_iostorinv.shift')">
+            <el-select
+              v-model="query.classes"
+              clearable
+              size="mini"
+              :placeholder="$t('common.Please_select')"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in classes"
+                :key="item.id"
+                :label="item.code"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+<!--          <el-form-item :label="$t('common.is_summary')">
+            <el-select
+              v-model="query.is_all"
+              clearable
+              size="mini"
+              :placeholder="$t('common.Please_select')"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>-->
+          <el-form-item style="display: flex; justify-content: flex-end;">
+            <rrOperation />
+          </el-form-item>
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-thumb"
+          size="mini"
+          :loading="showDtlLoading"
+          @click="downdtl"
+        >
+          {{ $t('common.Export') }}
+        </el-button>
+      </crudOperation>
+      <!--表格渲染-->
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        size="mini"
+        :data="crud.data"
+        highlight-current-row
+        style="width: 100%;"
+      >
+        <el-table-column
+          show-overflow-tooltip
+          prop="container_name"
+          :label="$t('common.finishedProductRollNumber')"
+          :min-width="flexWidth('container_name',crud.data,$t('common.finishedProductRollNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="confirm_time"
+          :label="$t('common.instorgeDate')"
+          :min-width="flexWidth('confirm_time',crud.data,$t('common.instorgeDate'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="date_of_production"
+          :label="$t('common.packingDate')"
+          :min-width="flexWidth('date_of_production',crud.data,$t('common.packingDate'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="customer_description"
+          :label="$t('common.customerName')"
+          :min-width="flexWidth('customer_description',crud.data,$t('common.customerName'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="sale_order_name"
+          :label="$t('common.orderNumber')"
+          :min-width="flexWidth('sale_order_name',crud.data,$t('common.orderNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="customer_batch_number"
+          :label="$t('common.batchNumber')"
+          :min-width="flexWidth('customer_batch_number',crud.data,$t('common.batchNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="customer_material_code"
+          :label="$t('common.materialNumber')"
+          :min-width="flexWidth('customer_material_code',crud.data,$t('common.materialNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="box_no"
+          :label="$t('common.boxNumber')"
+          :min-width="flexWidth('box_no',crud.data,$t('common.boxNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="box_customer_sn"
+          :label="$t('common.customerBoxNumber')"
+          :min-width="flexWidth('box_customer_sn',crud.data,$t('common.customerBoxNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="customer_roll_name"
+          :label="$t('common.customerRollNumber')"
+          :min-width="flexWidth('customer_roll_name',crud.data,$t('common.customerRollNumber'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="thickness_request"
+          :label="$t('common.customerRequiredThickness')"
+          :min-width="flexWidth('thickness_request',crud.data,$t('common.customerRequiredThickness'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="width_standard"
+          :label="$t('wms.pdm.bi.requiredWidth')"
+          :formatter="crud.formatNum0"
+          :min-width="flexWidth('width_standard',crud.data,$t('wms.pdm.bi.requiredWidth'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="spec"
+          :label="$t('common.spec')"
+          :min-width="flexWidth('spec',crud.data,$t('common.spec'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="net_weight"
+          :label="$t('common.subRollNetWeight')"
+          :formatter="crud.formatNum2"
+          :min-width="flexWidth('net_weight',crud.data,$t('common.subRollNetWeight'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="length"
+          :label="$t('common.meterage')"
+          :formatter="crud.formatNum2"
+          :min-width="flexWidth('length',crud.data,$t('common.meterage'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="total_net_weight"
+          :label="$t('common.totalNetWeight')"
+          :formatter="crud.formatNum2"
+          :min-width="flexWidth('total_net_weight',crud.data,$t('common.totalNetWeight'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="box_weight"
+          :label="$t('common.totalGrossWeight')"
+          :formatter="crud.formatNum2"
+                   :min-width="flexWidth('box_weight',crud.data,$t('common.totalGrossWeight'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="roll_remark"
+          :label="$t('common.remark')"
+          :min-width="flexWidth('roll_remark',crud.data,$t('common.remark'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="net_weight_convert"
+          :label="$t('common.netWeightConvert')"
+          :min-width="flexWidth('net_weight_convert',crud.data,$t('common.netWeightConvert'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="gross_weight_convert"
+          :label="$t('common.grossWeightConvert')"
+          :min-width="flexWidth('gross_weight_convert',crud.data,$t('common.grossWeightConvert'))"
+        />
+        <el-table-column
+          show-overflow-tooltip
+          prop="warranty_expire_date"
+          :label="$t('common.warranty_expire_date')"
+          :min-width="flexWidth('warranty_expire_date',crud.data,$t('common.warranty_expire_date'))"
+        />
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import CRUD, { crud, header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import DateRangePicker from '@/components/DateRangePicker/index'
+import crudUserStor from '@/views/wms/basedata/st/userStor/userStor'
+import crudInbillquery from '@/views/wms/stat/inbillquery/inbillquery'
+import { download } from '@/api/data'
+import { downloadFile } from '@/utils'
+
+export default {
+  name: 'InQuery3',
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  cruds() {
+    return CRUD({
+      title: '',
+      optShow: { add: false, reset: true },
+      idField: 'iostorinv_id',
+      url: '/api/in/InQuery/query3',
+      query: { 'is_all': '0', 'bill_type': '0001', 'createTime': [new Date(), new Date()], 'stor_id': '1582991156504039424' },
+      crudMethod: { ...crudInbillquery }
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  // 数据字典
+  dicts: ['io_bill_status', 'ST_INV_IN_TYPE', 'product_area', 'IS_OR_NOT'],
+  data() {
+    return {
+      height: document.documentElement.clientHeight - 180 + 'px;',
+      storlist: [],
+      classes: [{ 'id': '1', 'code': '白班' }, { 'id': '2', 'code': '晚班' }],
+      showDtlLoading: false
+    }
+  },
+  mounted: function() {
+    const that = this
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 180 + 'px;'
+    }
+  },
+  created() {
+    crudUserStor.getUserStor().then(res => {
+      this.storlist = res
+    })
+  },
+  methods: {
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    },
+    selectTime() {
+      var date = new Date()
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+      var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+
+      var start_day = y + '-' + m + '-' + '01' + ' ' + '00:00:00'
+      var end_day = `${y}-${m}-${d}` + ' ' + '23:59:59'
+      this.query.createTime = [new Date(start_day), new Date(end_day)]
+    },
+    bill_typeFormat(row, column) {
+      return this.dict.label.ST_INV_IN_TYPE[row.bill_type]
+    },
+    downdtl() {
+      const data = this.crud.query
+      if (this.crud.query.createTime !== undefined) {
+        data.begin_time = this.crud.query.createTime[0]
+        data.end_time = this.crud.query.createTime[1]
+      }
+      this.showDtlLoading = true
+      download('/api/in/InQuery/download3', data).then(result => {
+        downloadFile(result, '成品入库查询', 'xlsx')
+        this.showDtlLoading = false
+      }).catch(() => {
+        this.showDtlLoading = false
+      })
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 10px;
+}
+</style>