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

lty

3 天以前 c6e32e5da5d30ce2f74f0e32c3290d421c0951f2

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

 src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java

@@ -69,10 +69,10 @@
                        Integer number =  basArmRulesService.getNumber(mat.getWeight(),mat.getVolume(),mat.getManLength(),mat.getWidth(),mat.getHeight());
                        if (number == null) {
                            BasArmRules basArmRules = new BasArmRules();
                            basArmRules.setMaterialHeight(orderDetl.getHeight());
                            basArmRules.setMaterialWeight(orderDetl.getWeight());
                            basArmRules.setMaterialLength(orderDetl.getManLength());
                            basArmRules.setMaterialWidth(orderDetl.getWidth());
                            basArmRules.setMaterialHeight(mat.getHeight());
                            basArmRules.setMaterialWeight(mat.getWeight());
                            basArmRules.setMaterialLength(mat.getManLength());
                            basArmRules.setMaterialWidth(mat.getWidth());
                            basArmRulesService.insert(basArmRules);
                            return;
                        } else if (number == 0){

 src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java

@@ -18,7 +18,7 @@
    @Value("${erp.switch.InboundOrderSwitch}")
    private boolean InboundOrderSwitch;

    @Scheduled(cron = "0 */30 * * * ?")
    @Scheduled(cron = "0 */15 * * * ?")
    void login(){
        if(!InboundOrderSwitch){
            return;

 src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java

@@ -107,7 +107,10 @@
                                          SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
        JSONArray idArray = new JSONArray();
        JSONObject dataObj = new JSONObject();
        switch (kingDeeUtilType.formId) {
        if(kingDeeUtilType == null){
            return null;
        }
        switch(kingDeeUtilType.formId) {
            case "PUR_RECEIVEBIll": // 进仓通知单提交
                path = imPurinbillBatchAudit;
                idArray.add(order.getNumber());
@@ -195,9 +198,8 @@
            }
            // 解析返回的响应
            JSONObject data = jsonResponse.getJSONObject("data");
            String errorCode = jsonResponse.getString("errorCode");
            boolean status = jsonResponse.getBooleanValue("status");
            if ("0".equals(errorCode) && status) {
            if (status) {
                // 获取成功与失败的数量
                int successCount = data.getInteger("successCount");
                int failCount = data.getInteger("failCount");

 src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java

@@ -82,7 +82,9 @@

    private JSONObject buildRequestParams(Order order, KingDeeUtilType kingDeeUtilType, SimpleDateFormat sdf1, SimpleDateFormat sdf2) {
        List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",order.getOrderNo()));

        if(kingDeeUtilType == null){
            return null;
        }
        switch (kingDeeUtilType.formId) {
            case "PUR_RECEIVEBIll": // 进仓通知单
                path = imPurinbillAdd;

 src/main/webapp/static/js/orderPakout/order.js

@@ -129,7 +129,7 @@
                            {field: 'standby3', title: '客户SKU'},
                            {field: 'boxType1', title: '货主'},
                            {field: 'boxType3', title: '采购单号'},
                            ,{field: 'standby1', align: 'center',title: '客户PO', hide: false}
                            {field: 'standby1', align: 'center',title: '客户PO', hide: false}
                            ,{field: 'standby2', align: 'center',title: 'UPC', hide: false},
                            // {field: 'batch', title: '批号'},
                            // {field: 'anfme', title: '数量'},