修復

cp

2024-10-24 cc3185eaf94050d299cbd9d0c105eb3d1229996a

修復

 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/UserController.java

@@ -111,6 +111,12 @@
        if (user.getMobile()!=null) {
            entity.setMobile(user.getMobile());
        }
        if (user.getRoleId()!=null) {
            entity.setRoleId(user.getRoleId());
        }
        if (user.getSex()!=null) {
            entity.setSex(user.getSex());
        }
        userService.updateById(entity);
        return R.ok();
    }

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java

@@ -17,6 +17,8 @@

    List<OrderDetl> selectWorkingDetls(Long orderId);

    List<OrderDetl> selectDetls(Long orderId,Long hostId);

    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);

    OrderDetl selectItem2(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("hostId") Long hostId);

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java

@@ -124,7 +124,7 @@
        if (order.getSettle() >= 4L) {
            return;
        }
        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
        List<OrderDetl> orderDetls = orderDetlMapper.selectDetls(order.getId(),hostId);
        boolean complete = true;
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
@@ -132,32 +132,7 @@
                break;
            }
        }
        if (complete && wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getOrderNo, orderNo).eq(WrkDetl::getHostId, hostId)) == 0) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.getById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                List<OrderDetl> orderDetlList = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
//                if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
//                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
//                }
//                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
                for (OrderDetl orderDetl : orderDetlList) {
//                    OrderDetl orderDetl = new OrderDetl();
//                    orderDetl.sync(orderDetl1);
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
//                    orderDetl.setCreateTime(order.getCreateTime());
//                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
                    orderDetl.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.updateById(orderDetl)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
            }

        if (complete) {
            if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }

 zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml

@@ -24,6 +24,13 @@
        and qty &lt; anfme
    </select>

    <select id="selectDetls" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
        select * from wms_order_detl
        where 1=1
          and order_id = #{orderId}
          and host_id = #{hostId}
    </select>

    <select id="selectItem" resultType="com.zy.asrs.common.wms.entity.OrderDetl">
        select * from wms_order_detl
        where 1=1

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java

@@ -398,7 +398,7 @@
    @RequestMapping("/pick/mat/list")
    @ManagerAuth(memo = "获取并板物料")
    public R pickMats(@RequestParam(required = false) String matnr){
        List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getDocName, "入库"));
        List<DocType> docTypes = docTypeService.list(new LambdaQueryWrapper<DocType>().like(DocType::getPakin, 1));
        ArrayList<Long> typeList = new ArrayList<>();
        for (DocType docType : docTypes) {
            typeList.add(docType.getDocId());
@@ -440,7 +440,7 @@
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());
            matParam.setCount(count);
            matParam.setUseCount(0D);
            matParam.setUseCount(count);
            maps.add(matParam);
        }
        return R.ok().add(maps);

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java

@@ -50,6 +50,7 @@
                        .or().like("sta_no", condition)
                        .or().like("source_sta_no", condition)
                        .or().like("loc_no", condition)
                        .or().like("barcode",condition)
                        .or().like("source_loc_no", condition);
            });
        }

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java

@@ -79,7 +79,7 @@
                    log.error("", e); }
            }
        }
        if (!success){
        if (success){
            return FAIL.setMsg("上報失敗");
        }
        return SUCCESS;

 zy-asrs-wms/src/main/webapp/static/js/orderTable.js

@@ -40,7 +40,7 @@
        defaultToolbar: [],
        cols: [[
            // {type: 'numbers', title: '#'},
            {field: 'orderTime', title: '日期', width: 160},
            {field: 'orderTime', title: '日期', width: 120},
            {field: 'orderNo', title: '单据编号', align: 'center', width: 155},
            {field: 'docType$', title: '单据类型', align: 'center'}
        ]],