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

lty

3 天以前 53ca017d46403700cabc775fc4dbd89f8ebdef78

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

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -402,6 +402,7 @@
            return R.error("单据编号[order_id]以 "+sign_arm_sku+" 与 "+sign_arm_order+" 作为拆分标记拆分失败！！！");
        }
        if (param.getArm_no()>4){
            openService.taskArmOrderResult(param);
            return R.ok();
        }


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

@@ -48,11 +48,11 @@
    private String maktx;

    @ApiModelProperty(value= "规格")
    @ExcelProperty("规格")
    //@ExcelProperty("规格")
    private String specs;

    @ApiModelProperty(value= "货品特征")
    @ExcelProperty("货品特征")
    //@ExcelProperty("货品特征")
    private String batch;

    @ApiModelProperty(value= "单据编号")
@@ -173,18 +173,21 @@
     * 备用1(PO)
     */
    @ApiModelProperty(value= "备用1")//PO
    @ExcelProperty("客户PO")
    private String standby1 = "1";

    /**
     * 备用2(UPC)
     */
    @ApiModelProperty(value= "备用2")//UPC
    @ExcelProperty("条码UPC")
    private String standby2 = "1";

    /**
     * 备用3(SKU)
     */
    @ApiModelProperty(value= "备用3")//SKU
    @ExcelProperty("客户SKU")
    private String standby3 = "1";

    /**
@@ -192,6 +195,7 @@
     */
    @ApiModelProperty(value= "备用1")
    @TableField("box_type1")
    @ExcelProperty("货主")
    private String boxType1 = "1";

    /**
@@ -206,6 +210,7 @@
     */
    @ApiModelProperty(value= "备用3")
    @TableField("box_type3")
    @ExcelProperty("采购单号")
    private String boxType3 = "1";

    /**

 src/main/java/com/zy/asrs/service/OpenService.java

@@ -57,5 +57,6 @@
    boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
    boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
    boolean agvBindAndBin(String taskNo);
    boolean taskArmOrderResult(OrderArmEndParam param);

}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -774,7 +774,7 @@
        if (Cools.isEmpty(basArmMast)){
            throw new CoolException("未查询到相关机械臂拆码垛任务！！！"+ JSON.toJSONString(param));
        }
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
//        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
        basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
    }

@@ -802,6 +802,22 @@

    @Override
    @Transactional
    public boolean taskArmOrderResult(OrderArmEndParam param){
        if(param.getDone_num() == 0){
            if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
                    .eq("status",1))){
                return true;
            }
        }
        if(param.getDone_num() == 1){
            return true;
        }
        log.error("未找到对应任务"+ param);
        return false;
    }

    @Override
    @Transactional
    public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
        BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
                new EntityWrapper<BasArmMastSign>()

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

@@ -35,7 +35,7 @@
    @Autowired
    private BasArmMastSignService basArmMastSignService;

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    private void orderToSortLine() {
        //获取未下发单据
        List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);

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

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

//    @Scheduled(cron = "0/20 * * * * ?")
    @Scheduled(cron = "0/20 * * * * ?")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){

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

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

//    @Scheduled(cron = "0/20 * * * * ?")
    @Scheduled(cron = "0/20 * * * * ?")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if(!ReviewOrderSwitch){

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

@@ -236,9 +236,9 @@
                                    // 更新字段
                                    if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
                                    if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
                                    if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);
                                    if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);
                                    if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);
                                    if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
                                        mat.setCreateTime(sdf1.parse(createTime));
                                    mat.setUpdateTime(modifyTime);

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

@@ -209,14 +209,10 @@
                        JSONObject resultItem = resultArray.getJSONObject(i);
                        String billNo = resultItem.getString("number");  // 获取返回的单据号
                        String billId = resultItem.getString("id");      // 获取返回的ID
                        order.setNumber(billId);
                        orderService.updateById(order);
                        log.info("订单号 {} 与返回的单据号匹配，设置订单 ID 为 {}", order.getOrderNo(), billId);

                        // 判断返回的单据号与订单号是否一致
                        if (billNo != null && billNo.equals(order.getOrderNo())) {
                            // 如果一致，设置订单的 number
                            order.setNumber(billId);
                            orderService.updateById(order);
                            log.info("订单号 {} 与返回的单据号匹配，设置订单 ID 为 {}", order.getOrderNo(), billId);
                        }
                    }
                } else {
                    log.error("接口调用失败，失败的操作数量: {}", failCount);

 src/main/resources/mapper/LocDetlMapper.xml

@@ -414,9 +414,15 @@
        ROW_NUMBER() over (order by sum(a.anfme) desc) as row
        , a.matnr
        , sum(a.anfme) as anfme
        , a.order_no as orderNo
        , a.standby1
        , a.standby2
        , a.standby3
        , a.box_type1 as boxType1
        , a.box_type3 as boxType3
        from asr_loc_detl a
        where 1=1
        group by a.matnr
        group by a.matnr,a.order_no,a.box_type3,a.standby1,a.standby2,a.standby3,a.box_type1
    </select>

    <select id="selectPakoutByRule" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -234,7 +234,7 @@
    ,{field: 'anfme', align: 'center',title: '数量', hide: false}
    ,{field: 'zpallet', align: 'center',title: '托盘条码', hide: false}

    // ,{field: 'specs', align: 'center',title: '规格', hide: true}
    ,{field: 'boxType3', align: 'center',title: '采购单号', hide: true}
    // ,{field: 'model', align: 'center',title: '代码', hide: true}
    // ,{field: 'color', align: 'center',title: '颜色', hide: true}
    // ,{field: 'brand', align: 'center',title: '品牌', hide: true}