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

@@ -103,8 +103,50 @@ public class InProduceOrderController extends BaseController {
     @GetMapping("searchFromSAP")
     public ApiResult<ZWM00MB007DTO> searchFromSAP(@Valid @RequestParam @NotBlank String no){
         return ApiResult.success(sapService.zwm00Mb007(no));
+//        return ApiResult.success(new ZWM00MB007DTO()
+//                .setAufnr(RandomUtil.randomNumbers(10))
+//                .setMatnr(RandomUtil.randomString(11))
+//                .setMaktx(RandomUtil.randomString(20))
+//                .setLgort(RandomUtil.randomNumbers(4))
+//                .setPwerk("1010")
+//                .setPsmng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("100")))
+//                .setMeins(RandomUtil.randomString(2))
+//                .setWemng(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50")))
+//                .setWshsl(RandomUtil.randomBigDecimal(BigDecimal.ZERO, new BigDecimal("50")))
+//        );
     }
 
+//    /**
+//     * 生成物料列表
+//     * @param request 请求参数
+//     * @return 生成结果
+//     */
+//    @PostMapping("generateMaterials")
+//    public ApiResult<InProduceOrderMaterialVO> generateMaterials(@Valid @RequestBody InProduceOrderGenerateMaterialsQO request) {
+//        InProduceOrderMaterialVO vo=new InProduceOrderMaterialVO()
+//                .setMaterialNo(request.getMatnr())
+//                .setMaterialDesc(request.getMaktx())
+//                .setUnit(request.getMeins())
+//                .setNum(request.getNum())
+//                .setFactoryNo(request.getPwerk())
+//                .setWarehouseNo(request.getLgort())
+//                .setOderNum(request.getPsmng());
+//        if (request.getList()){
+//            List<WmsBom> children = bomService.getChildren(request.getMatnr());
+//            vo.setChildren(children.stream().map(it -> new InProduceOrderMaterialVO()
+//                            .setMaterialNo(it.getNo())
+//                            .setMaterialDesc(it.getDescribe())
+//                            .setUnit(request.getMeins())
+//                            .setNum(request.getNum().multiply(it.getNum()))
+//                            .setFactoryNo(request.getPwerk())
+//                            .setWarehouseNo(request.getLgort())
+//                            .setOderNum(request.getPsmng())
+//                    ).toList()
+//            );
+//        }
+//        return ApiResult.success(vo);
+//    }
+
     /**
      * 保存
      * @param request 请求参数
@@ -236,7 +278,6 @@ public class InProduceOrderController extends BaseController {
                 } else {
                     dto.setPrintNum(DF.format(BigDecimal.ONE));
                 }
-                dto.setSupplierCode("");
                 dto.setBatchNo("");//NoUtil.getBatchNo("")
                 dto.setQrCode(QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, ""), 100, 100));
                 datas.add(dto);
@@ -256,9 +297,9 @@ public class InProduceOrderController extends BaseController {
     }
 
     private String generateQRContent(DeliverNormalOrderItemDTO order,String indexNo){
-        String content = StrUtil.format("{}${}${}${}${}${}${}${}${}"
+        String content= StrUtil.format("{}${}${}${}${}${}${}${}"
                 , order.getPrintNo(), order.getExternalOrderNo(),order.getRowNo(),order.getMaterialNo(),order.getPrintNum()
-                , order.getMaterialDesc(), order.getSupplierCode(), order.getBatchNo(), Optional.ofNullable(indexNo).orElse(""));
+                ,order.getMaterialDesc(),order.getBatchNo(),Optional.ofNullable(indexNo).orElse(""));
         log.debug("二维码内容:"+ content);
         return content;
     }

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

@@ -160,6 +160,25 @@ public class NormalOrderController extends BaseController {
      */
     @PostMapping("exportPdfPerPage")
     public void exportPdfPerPage(HttpServletResponse response, @Valid @RequestBody @NotNull List<Long> ids) throws Exception {
+//        List<DeliverNormalOrderVO> orders=new ArrayList<>();
+//        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
+//            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
+//            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
+//            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
+//            orders.add(new DeliverNormalOrderVO()
+//                    .setId(IdUtil.getSnowflakeNextId())
+//                    .setMaterialNo(RandomUtil.randomNumbers(10))
+//                    .setMaterialDesc(RandomUtil.randomString(10))
+//                    .setBatchNum(batchNum)
+//                    .setMinPackageNum(minPackageNum)
+//                    .setSupplierCode(RandomUtil.randomString(10))
+//                    .setSupplierName(RandomUtil.randomString(10))
+//                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
+//                    .setRowNo(RandomUtil.randomString(10))
+//                            .setIndexNo(RandomUtil.randomString(10))
+//                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
+//            );
+//        }
         List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据");
         exportPdfPerPage(convert(orders), response);
@@ -171,6 +190,25 @@ public class NormalOrderController extends BaseController {
      */
     @PostMapping("exportPdfOnePage")
     public void exportPdfOnePage(HttpServletResponse response, @Valid @RequestBody @NotNull List<Long> ids) throws Exception {
+//        List<DeliverNormalOrderVO> orders=new ArrayList<>();
+//        for (int i = 0,count=RandomUtil.randomInt(1,50); i < count; i++) {
+//            BigDecimal batchNum = RandomUtil.randomBigDecimal(new BigDecimal("10"));
+//            BigDecimal minPackageNum = RandomUtil.randomBigDecimal(new BigDecimal("1"),new BigDecimal("3"));
+//            BigDecimal[] result = batchNum.divideAndRemainder(minPackageNum);
+//            orders.add(new DeliverNormalOrderVO()
+//                    .setId(IdUtil.getSnowflakeNextId())
+//                    .setMaterialNo(RandomUtil.randomNumbers(10))
+//                    .setMaterialDesc(RandomUtil.randomString(10))
+//                    .setBatchNum(batchNum)
+//                    .setMinPackageNum(minPackageNum)
+//                    .setSupplierCode(RandomUtil.randomString(10))
+//                    .setSupplierName(RandomUtil.randomString(10))
+//                    .setExternalOrderNo(RandomUtil.randomNumbers(10))
+//                    .setRowNo(RandomUtil.randomString(10))
+//                    .setIndexNo(RandomUtil.randomString(10))
+//                    .setLableNum(result[1].compareTo(BigDecimal.ZERO)==0?result[0].intValue():result[0].intValue()+1)
+//            );
+//        }
         List<DeliverNormalOrderVO> orders = deliverNormalOrderService.getList(ids);
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据");
         exportPdfInAll(convert(orders), response);
@@ -194,7 +232,6 @@ public class NormalOrderController extends BaseController {
                 } else {
                     dto.setPrintNum(DF.format(order.getMinPackageNum()));
                 }
-                dto.setSupplierCode(order.getSupplierNo());
                 dto.setQrCode(QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, CollectionUtil.get(indexNos, i)), 100, 100));
                 datas.add(dto);
             }
@@ -203,9 +240,9 @@ public class NormalOrderController extends BaseController {
     }
 
     private String generateQRContent(DeliverNormalOrderItemDTO order, String indexNo) {
-        String content = StrUtil.format("{}${}${}${}${}${}${}${}${}"
+        String content = StrUtil.format("{}${}${}${}${}${}${}${}"
                 , order.getPrintNo(), order.getExternalOrderNo(), order.getRowNo(), order.getMaterialNo(), order.getPrintNum()
-                , order.getMaterialDesc(), order.getSupplierCode(), order.getBatchNo(), Optional.ofNullable(indexNo).orElse(""));
+                , order.getMaterialDesc(), order.getBatchNo(), Optional.ofNullable(indexNo).orElse(""));
         log.debug("二维码内容:" + content);
         return content;
     }
@@ -268,7 +305,7 @@ public class NormalOrderController extends BaseController {
         exportPdfInAll(convert1(datas.get(0).getSupplierNo(), datas), response);
     }
 
-    private List<DeliverNormalOrderItemDTO> convert1(String supplierNo, List<DeliverNormalOrderSaveItemQO> orders) {
+    private List<DeliverNormalOrderItemDTO> convert1(String supplierNo, List<DeliverNormalOrderSaveItemQO> orders) throws Exception {
         List<DeliverNormalOrderItemDTO> datas = new ArrayList<>();
         for (DeliverNormalOrderSaveItemQO order : orders) {
             List<String> indexNos = StrUtil.split(order.getIndexNo(), ",");
@@ -291,7 +328,6 @@ public class NormalOrderController extends BaseController {
                 } else {
                     dto.setPrintNum(DF.format(order.getMinPackageNum()));
                 }
-                dto.setSupplierCode(supplierNo);
                 dto.setQrCode(QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, CollectionUtil.get(indexNos, i)), 100, 100));
                 datas.add(dto);
             }

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

@@ -228,7 +228,7 @@ public class OutCostCenterController extends BaseController {
                             .setSerialNo(qrCodeContent.getSerialNo())
                             .setUniqNo(qrCodeContent.getUniqNo())
                             .setFactoryNo(order.getWerks())
-                            .setWarehouseNo(request.getLgort())
+                            .setWarehouseNo(item.getLgort())
                             .setNum(qrCodeContent.getNum())
                             .setCreateBy(UserUtil.getUserName())
                             .setCreateTime(Instant.now())

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java

@@ -19,9 +19,4 @@ public class WarehouseSearchQO extends PageQO{
      * 启用状态
      */
     private Boolean enable;
-
-    /**
-     * 工厂编号
-     */
-    private String factoryNo;
 }

nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml

@@ -8,7 +8,7 @@
         from wms_component_packing
         <where>
             <if test="request.no !=null and request.no !=''">
-                and "no" ilike concat('%', #{request.no}, '%')
+                and no ilike concat('%', #{request.no}, '%')
             </if>
             <if test="request.name1 !=null and request.name1 !=''">
                 and name1 ilike concat('%', #{request.name1}, '%')
@@ -41,7 +41,7 @@
         from wms_component_packing
         where is_completed=0
         <if test="no !=null and no !=''">
-            and ("no" like concat('%', #{no}, '%') or vbelv like concat('%', #{no}, '%'))
+            and （no like concat('%', #{no}, '%') or vbelv like concat('%', #{no}, '%')）
         </if>
         order by datum desc
     </select>

nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml

@@ -16,9 +16,6 @@
             <if test="request.name != null and request.name != ''">
                 and w.name ilike concat('%',#{request.name},'%')
             </if>
-            <if test="request.factoryNo != null and request.factoryNo != ''">
-                and di.code ilike concat('%',#{request.factoryNo},'%')
-            </if>
         </where>
         order by w.id desc
     </select>