优化MES调拨信息上报及库位查询逻辑

zhangc

2024-12-31 a440992f23e33ccf9e0f6d52079e9b16813ead59

优化MES调拨信息上报及库位查询逻辑

 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -51,6 +51,7 @@
    @ExcelIgnore
    private String crn_end_time;


    @ColumnWidth(15)
    @ExcelProperty(value = "销售单号")
    private String three_code;

 src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java

@@ -18,7 +18,7 @@

    @Data
    public static class RecordCustomFieldBaseCO{
        private List<CustomField> customFields;
        private CustomField customFields;

        @Data
        public static class CustomField{

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -430,7 +430,7 @@
                    //货架类型
                    wrkMast.setWhsType(Integer.valueOf(agvWrkMast.getBarcode().substring(0, 2)));

                    wrkMast.setAppeUser(9527L);
                    wrkMast.setAppeUser(agvWrkMast.getAppeUser());
                    wrkMast.setAppeTime(now);
                    wrkMast.setModiUser(9527L);
                    wrkMast.setModiTime(now);
@@ -820,11 +820,11 @@
        MesOrderReportParam param = new MesOrderReportParam();

        List<MesOrderReportParam.TransferOrderItem> transferOrderItems = new ArrayList<>();
        List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
        List<MesOrderReportParam.RecordCustomFieldBaseCO.CustomField> customFields = new ArrayList<>();

        //MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customFields = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField();

        MesOrderReportParam.RecordCustomFieldBaseCO recordCustomFieldBaseCO = new MesOrderReportParam.RecordCustomFieldBaseCO();
        recordCustomFieldBaseCO.setCustomFields(customFields);
        //recordCustomFieldBaseCO.setCustomFields(customFields);
        param.setRecordCustomFieldBaseCO(recordCustomFieldBaseCO);

        //添加transferOrderItem属性
@@ -839,11 +839,12 @@
            transferOrderItem.setTargetLocationCode(getTargetLocationByFloor(floor));
        }
        transferOrderItems.add(transferOrderItem);
        transferOrderItem.setInventoryDetails(inventoryDetails);


        param.setTransferOrderItems(transferOrderItems);

        for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
            List<MesOrderReportParam.TransferOrderItem.InventoryDetail> inventoryDetails = new ArrayList<>();
            MesOrderReportParam.TransferOrderItem.InventoryDetail inventoryDetail = new MesOrderReportParam.TransferOrderItem.InventoryDetail();
            //添加amount属性
            MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount amount = new MesOrderReportParam.TransferOrderItem.InventoryDetail.Amount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null);
@@ -857,12 +858,13 @@
            inventoryDetail.setQcStatus(1);
            inventoryDetail.setStorageStatus(1);
            inventoryDetails.add(inventoryDetail);
            transferOrderItem.setInventoryDetails(inventoryDetails);
            //添加销售订单号
            MesOrderReportParam.RecordCustomFieldBaseCO.CustomField customField = new MesOrderReportParam.RecordCustomFieldBaseCO.CustomField("workOrderCode__c", agvWrkDetl.getThreeCode().trim());
            customFields.add(customField);
            //customFields.add(customField);
            recordCustomFieldBaseCO.setCustomFields(customField);
            doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1");
        }

        doHttpRequest(param, getMesTokenInfo(), "上报mes调拨信息", url, orderReportPath, null, "127.0.0.1");

    }


 src/main/resources/mapper/ViewWorkInMapper.xml

@@ -8,6 +8,9 @@
        <if test="loc_no!=null and loc_no!='' ">
            and loc_no like '%' + #{loc_no} + '%'
        </if>
        <if test="supp_code!=null and supp_code!='' ">
            and supp_code like '%' + #{supp_code} + '%'
        </if>
        <if test="matnr!=null and matnr!='' ">
            and matnr like '%' + #{matnr} + '%'
        </if>
@@ -48,6 +51,9 @@
        <if test="loc_no!=null and loc_no!='' ">
            and loc_no like '%' + #{loc_no} + '%'
        </if>
        <if test="supp_code!=null and supp_code!='' ">
            and supp_code like '%' + #{supp_code} + '%'
        </if>
        <if test="matnr!=null and matnr!='' ">
            and matnr like '%' + #{matnr} + '%'
        </if>