nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java

@@ -16,6 +16,7 @@ import com.nflg.wms.common.pojo.qo.ComponentPackingEditInputQO;
 import com.nflg.wms.common.pojo.qo.ComponentPackingInputQO;
 import com.nflg.wms.common.pojo.qo.ComponentPackingQO;
 import com.nflg.wms.common.pojo.vo.*;
+import com.nflg.wms.common.util.PageUtil;
 import com.nflg.wms.common.util.VUtil;
 import com.nflg.wms.repository.entity.WmsComponentPacking;
 import com.nflg.wms.repository.entity.WmsComponentPackingItem;
@@ -194,12 +195,12 @@ public class ComponentPackingController {
         if (CollectionUtil.isEmpty(tasks)) {
             return ApiResult.success(Collections.emptyList());
         }
+        Integer type = bomService.getScanType(packing.getMatnr());
         // 转换为 VO 对象
         List<ComponentPackingItemPdaVO> daVos = tasks.stream()
                 .map(item1 -> {
                     ComponentPackingItemPdaVO vo = Convert.convert(ComponentPackingItemPdaVO.class, item1);
-                    vo.setQiTao(bomService.isQiTao(vo.getIdnrk()));
+                    vo.setQiTao(type > 0);
-                    Integer type = bomService.getScanType(vo.getIdnrk());
                     if (Objects.equals(type, 1)) {
                         vo.setChildren(bomService.getChildrenVO(vo.getIdnrk()));
                     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java

@@ -22,13 +22,9 @@ import com.nflg.wms.common.pojo.vo.InProduceOrderItemVO;
 import com.nflg.wms.common.pojo.vo.InProduceOrderMaterialVO;
 import com.nflg.wms.common.pojo.vo.InProduceOrderVO;
 import com.nflg.wms.common.util.DateTimeUtil;
-import com.nflg.wms.common.util.NumberUtil;
 import com.nflg.wms.common.util.UserUtil;
 import com.nflg.wms.common.util.VUtil;
-import com.nflg.wms.repository.entity.WmsBom;
+import com.nflg.wms.repository.entity.*;
-import com.nflg.wms.repository.entity.WmsInProduceOrder;
-import com.nflg.wms.repository.entity.WmsInProduceOrderItem;
-import com.nflg.wms.repository.entity.WmsQrCodeMaster;
 import com.nflg.wms.repository.service.*;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
@@ -122,6 +118,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 从SAP查询生产订单信息
+     *
      * @param no 生产订单号
      * @return 订单信息
      */
@@ -132,6 +129,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 保存
+     *
      * @param request 请求参数
      */
     @Transactional
@@ -171,7 +169,7 @@ public class InProduceOrderController extends BaseController {
                             .setId(IdUtil.getSnowflakeNextId())
                             .setOrderId(order.getId())
                             .setParentId(parent.getId())
-                            .setNum(it.getNum())
+                            .setNum(request.getNum().multiply(it.getNum()))
                             .setMaterialNo(it.getNo())
                             .setMaterialDesc(it.getDescribe())
                             .setUnit(request.getMeins())
@@ -191,7 +189,7 @@ public class InProduceOrderController extends BaseController {
                             .setMaterialCode(it.getMaterialNo())
                             .setMaterialDescription(it.getMaterialDesc())
                             .setPackagingType((short) 0)
-                            .setQuantity(NumberUtil.multiply(it.getNum(), parent.getNum()))
+                            .setQuantity(it.getNum())
                             .setUnit(it.getUnit())
                             .setBatchNo(it.getBatchNo())
                             .setSerialNo(it.getSernr())
@@ -224,6 +222,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 搜索
+     *
      * @param request 搜索参数
      * @return 搜索结果
      */
@@ -234,6 +233,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 获取订单的物料列表
+     *
      * @param id 订单ID
      * @return 列表
      */
@@ -252,6 +252,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 删除
+     *
      * @param id 订单ID
      */
     @Transactional
@@ -268,6 +269,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 导出物料条码pdf(逐个)
+     *
      * @param id   订单ID
      * @param type 1：逐个，2：一页
      */
@@ -376,6 +378,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 获取订单信息（PDA使用）
+     *
      * @param no 报工单号
      */
     @GetMapping("getOrderInfo")
@@ -395,13 +398,13 @@ public class InProduceOrderController extends BaseController {
                     List<InProduceOrderItemVO> children = list.stream()
                             .filter(child -> Objects.equals(child.getParentId(), it.getId()))
                             .toList();
-                    it.setQiTao(CollectionUtil.isNotEmpty(children));
                     Integer type = bomService.getScanType(it.getMaterialNo());
+                    it.setQiTao(type > 0);
                     if (Objects.equals(type, 0)) {
                         it.setMustScan(false);
                     }
                     children.forEach(child -> {
-                        child.setQiTao(false);
+                        child.setQiTao(it.isQiTao());
                         child.setMustScan(it.isMustScan());
                         child.setBinNo(binService.getBinNo(child.getMaterialNo(), child.getFactoryNo(), child.getWarehouseNo()));
                         child.setIsDisableLocation(warehouseService.isEnableLocation(child.getFactoryNo(), child.getWarehouseNo()));
@@ -415,6 +418,7 @@ public class InProduceOrderController extends BaseController {
 
     /**
      * 收货和入库（PDA使用）
+     *
      * @param request 请求参数
      */
     @Transactional
@@ -428,21 +432,19 @@ public class InProduceOrderController extends BaseController {
         List<InProduceOrderItemVO> datas;
         if (order.getList()) {
             datas = new ArrayList<>();
-            list.stream().filter(it -> Objects.equals(it.getParentId(), 0L))
+            list.stream().filter(it -> Objects.equals(it.getParentId(), 0L)).forEach(it -> {
-                    .forEach(it -> {
+                List<InProduceOrderItemVO> children = list.stream()
-                        List<InProduceOrderItemVO> children = list.stream()
+                        .filter(child -> Objects.equals(child.getParentId(), it.getId()))
-                                .filter(child -> Objects.equals(child.getParentId(), it.getId()))
+                        .toList();
-                                .toList();
+                Integer type = bomService.getScanType(it.getMaterialNo());
-                        Integer type = bomService.getScanType(it.getMaterialNo());
+                children.forEach(child -> {
-                        children.forEach(child -> {
+                    child.setQiTao(type > 0);
-                            child.setNum(NumberUtil.multiply(child.getNum(), it.getNum()));
+                    if (Objects.equals(type, 0)) {
-                            child.setQiTao(false);
+                        child.setMustScan(false);
-                            if (Objects.equals(type, 0)) {
+                    }
-                                child.setMustScan(false);
+                });
-                            }
+                datas.addAll(children);
-                        });
+            });
-                        datas.addAll(children);
-                    });
         } else {
             datas = list;
         }
@@ -457,9 +459,9 @@ public class InProduceOrderController extends BaseController {
         List<WmsQrCodeMaster> qrCodeMasters = CollectionUtil.isEmpty(allQrCodes)
                 ? Collections.emptyList()
                 : qrCodeMasterService.lambdaQuery()
-                  .ne(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
+                .ne(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
-                  .in(WmsQrCodeMaster::getBarcodeCode, allQrCodes)
+                .in(WmsQrCodeMaster::getBarcodeCode, allQrCodes)
-                  .list();
+                .list();
         datas.forEach(it -> {
             InventoryIn1ItemQO qitem = request.getItems().stream()
                     .filter(item -> Objects.equals(item.getItemId(), it.getId()))

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java

@@ -211,7 +211,7 @@ public class OutAssistanceController extends BaseController {
                                             .setMatnr(item.getMatnr1())
                                             .setMeins(item.getMeins())
                                             .setNum(item.getLeft());
-                                    vo.setQiTao(bomService.isQiTao(item.getMatnr1()));
+                                    vo.setQiTao(type > 0);
                                     if (Objects.equals(type, 1)) {
                                         vo.setChildren(bomService.getChildrenVO(item.getMatnr1()));
                                     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java

@@ -213,7 +213,7 @@ public class OutCostCenterController extends BaseController {
                                             .setMatnr(item.getMatnr())
                                             .setNum(item.getLeft())
                                             .setMeins(item.getMeins());
-                                    vo.setQiTao(bomService.isQiTao(item.getMatnr()));
+                                    vo.setQiTao(type > 0);
                                     if (Objects.equals(type, 1)) {
                                         vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
                                     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java

@@ -365,7 +365,7 @@ public class OutProduceController extends BaseController {
                                     .setMeins(item.getMeins())
                                     .setNum(item.getSqsl().subtract(item.getNum()));
                             Integer type = bomService.getScanType(item.getMatnr());
-                            vo.setQiTao(bomService.isQiTao(item.getMatnr()));
+                            vo.setQiTao(type > 0);
                             if (Objects.equals(type, 1)) {
                                 vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
                             }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java

@@ -269,7 +269,7 @@ public class TransferCompanyController extends BaseController {
                                             .setMaktx(item.getMaktx())
                                             .setNum(item.getLeft())
                                             .setMeins(item.getMeins());
-                                    vo.setQiTao(bomService.isQiTao(item.getMatnr()));
+                                    vo.setQiTao(type > 0);
                                     if (Objects.equals(type, 1)) {
                                         vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
                                     }

nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java

@@ -268,7 +268,7 @@ public class TransferFactoryController extends BaseController {
                                             .setMeins(item.getMeins())
                                             .setBinIn(StrUtil.join("/", storageService.getBinNo(item.getMatnr(), order.getWerks(), order.getUmlgo())))
                                             .setBinOut(StrUtil.join("/", storageService.getBinNo(item.getMatnr(), order.getWerks(), order.getLgort())));
-                                    vo.setQiTao(bomService.isQiTao(item.getMatnr()));
+                                    vo.setQiTao(type > 0);
                                     if (Objects.equals(type, 1)) {
                                         vo.setChildren(bomService.getChildrenVO(item.getMatnr()));
                                     }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsBomService.java

@@ -35,6 +35,4 @@ public interface IWmsBomService extends IService<WmsBom> {
 //    boolean isParent(String materialNo);
 
     Integer getScanType(String materialNo);
-
-    boolean isQiTao(String materialNo);
 }

nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsBomServiceImpl.java

@@ -188,12 +188,4 @@ public class WmsBomServiceImpl extends ServiceImpl<WmsBomMapper, WmsBom> impleme
                 ).orElse(new WmsBom().setScanType(-1))
                 .getScanType();
     }
-
-    @Override
-    public boolean isQiTao(String materialNo) {
-        return lambdaQuery()
-                .eq(WmsBom::getParentId, 0)
-                .eq(WmsBom::getNo, materialNo)
-                .exists();
-    }
 }