#界面字段显示，订单已完成数量bug修复

lty

6 天以前 0413bd96309c71a2dc3b292fa25f9ca22d268b46

#界面字段显示，订单已完成数量bug修复

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

@@ -45,15 +45,15 @@
         */
        private String orderNo;

        /**
         * 客户名称
         */
        private String customerName;

        /**
         * 订单备注
         */
        private String memo;
//        /**
//         * 客户名称
//         */
//        private String customerName;
//
//        /**
//         * 订单备注
//         */
//        private String memo;

        /**
         * 订单明细总数
@@ -69,6 +69,7 @@
         * 工作中订单明细数
         */
        private Integer workQuantity;
        private Integer completeQuantity;

        @Data
        public static class MaterialDetail {
@@ -101,6 +102,17 @@
            private Double length;

            private Double volume;
            /**
             * 客户名称
             */
            private String customerName;

            /**
             * 订单备注
             */
            private String memo;


        }

    }

 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java

@@ -63,4 +63,6 @@
     * 获取包装组号列表
     */
    List<String> selectDetlList(@Param("orderNo") String orderNo);

    List<OrderDetl> selectByBrand(@Param("brand") String brand);
}

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

@@ -37,4 +37,6 @@
     * @return
     */
    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);

    List<OrderDetl> selectByBrand(String brand);
}

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

@@ -2013,6 +2013,8 @@
                materialDetail.setWeight(wrkDetl.getWeight());
                materialDetail.setLength(wrkDetl.getLength());
                materialDetail.setVolume(wrkDetl.getVolume());
                materialDetail.setCustomerName(wrkDetl.getSupp());
                materialDetail.setMemo(wrkDetl.getMemo());
                material.setBoxPos(wrkDetl.getOrigin()); // 托盘上木箱位置
                materialDetailList.add(materialDetail);
            }
@@ -2022,14 +2024,15 @@
                Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", wrkDetl.getOrderNo()));
                if (order != null) {
                    material.setOrderNo(order.getOrderNo());
                    material.setMemo(order.getMemo());
                    material.setCustomerName(order.getCstmrName());
//                    material.setMemo(order.getMemo());
//                    material.setCustomerName(order.getCstmrName());
                    List<OrderStatisticsDto> unfulfilledOrders = orderMapper.getUnfulfilledOrders(order.getOrderNo());
                    if (unfulfilledOrders.size() == 1) {
                        OrderStatisticsDto orderStatisticsDto = unfulfilledOrders.get(0);
                        material.setSum(orderStatisticsDto.getSum());
                        material.setToShipQuantity(orderStatisticsDto.getToShipQuantity());
                        material.setWorkQuantity(orderStatisticsDto.getWorkQuantity());
                        material.setCompleteQuantity(orderStatisticsDto.getCompletedQuantity());
                    }
                }
            }

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

@@ -7,6 +7,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.apache.poi.poifs.crypt.dsig.OOXMLURIDereferencer;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -90,4 +91,9 @@
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
    }

    @Override
    public List<OrderDetl> selectByBrand(String brand) {
        return this.baseMapper.selectByBrand(brand);
    }
}

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

@@ -385,7 +385,16 @@
            for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
                if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
                WrkDetl wrkDetl = new WrkDetl();
                List<OrderDetl> orderDetl = orderDetlService.selectByBrand(detlDto.getLocDetl().getBrand());
                wrkDetl.sync(detlDto.getLocDetl());
                for (OrderDetl orderDetlDto : orderDetl) {
                    if(orderDetlDto.getSupp() != null){
                        wrkDetl.setSupp(orderDetlDto.getSupp());
                    }
                    if(orderDetlDto.getMemo() != null){
                        wrkDetl.setMemo(orderDetlDto.getMemo());
                    }
                }
                wrkDetl.setOrderNo(detlDto.getOrderNo()); // 手动出库不需要带出库存中的单据编号
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(now);

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -12,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import javax.annotation.Resource;
import java.util.Iterator;
import java.util.List;

@@ -40,6 +42,9 @@
    private WrkMastStaService wrkMastStaService;
    @Autowired
    private WrkMastStaLogService wrkMastStaLogService;

    @Resource
    private OrderDetlMapper orderDetlMapper;

    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
@@ -91,11 +96,18 @@

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
//                if (!Cools.isEmpty(wrkDetls)) {
//                    if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
//                        exceptionHandle("生成手动出库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                    }
//                }
                List<WrkDetl> wrkDetls101 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                if (wrkDetls101.isEmpty()) {
//                        exceptionHandle("全板出库 ===>> 工作明细档为空；[workNo={0}]", wrkMast.getWrkNo());
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return FAIL.setMsg("全板出库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                }
                for (WrkDetl wrkDetl : wrkDetls101) {
                    if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                        // 更新订单完成数量
                        orderDetlMapper.updateOrderDetlQtyByGroupNo(wrkDetl.getOrderNo(), wrkDetl.getBrand());
                    }
                }
            }

            // 保存工作主档历史档

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -264,4 +264,10 @@
        </foreach>
    </update>

    <select id="selectByBrand" resultMap="BaseResultMap">
        select *
        from man_order_detl
        where brand = #{brand}
    </select>

</mapper>