lombok.config

@@ -1 +0,0 @@
-lombok.equalsandhashcode.callSuper = SKIP

nflg-wms-admin/pom.xml

@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.xhtmlrenderer</groupId>
             <artifactId>flying-saucer-pdf</artifactId>
-            <version>9.13.3</version>
+            <version>9.11.2</version>
             <exclusions>
                 <exclusion>
                     <artifactId>bcprov-jdk14</artifactId>
@@ -93,14 +93,13 @@
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>itext7-core</artifactId>
+            <artifactId>itextpdf</artifactId>
-            <version>7.2.6</version>
+            <version>5.5.13.4</version>
-            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
-            <artifactId>font-asian</artifactId>
+            <artifactId>itext-asian</artifactId>
-            <version>7.2.6</version>
+            <version>5.2.0</version>
         </dependency>
         <dependency>
             <groupId>com.sap.conn.jco</groupId>

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

@@ -178,7 +178,7 @@ public class InCostCenterBackController extends BaseController {
                                     .setMatnr(item.getMatnr())
                                     .setNum(item.getLeft());
                             if (StrUtil.isBlank(vo.getLgort2())) {
-                                vo.setLgort2(CollectionUtil.get(storageService.getWarehouseNo(order.getWerks(), item.getMatnr()), 0));
+                                vo.setLgort2(storageService.getWarehouseNo(order.getWerks(), item.getMatnr()));
                             }
                             if (StrUtil.isNotBlank(vo.getLgort2()) && StrUtil.isBlank(vo.getLgpbe())) {
                                 vo.setLgpbe(StrUtil.join("/", storageService.getBinNos(item.getMatnr(), order.getWerks(), vo.getLgort2())));
@@ -324,21 +324,20 @@ public class InCostCenterBackController extends BaseController {
         WmsInCostcenterBack info = inCostcenterBackService.getById(id);
         VUtil.trueThrowBusinessError(Objects.isNull(info)).throwMessage("退料单不存在");
         InCostcenterBackInfoVO order = Convert.convert(InCostcenterBackInfoVO.class, info);
-        List<InCostcenterBackItemVO> list = Convert.toList(InCostcenterBackItemVO.class, inCostcenterBackItemService.getList(id));
+        List<WmsInCostcenterBackItem> list = inCostcenterBackItemService.getList(id);
 //        InCostcenterBackInfoVO order = new InCostcenterBackInfoVO();
 //        order.setNo(NoUtil.getOutCostcenterNo());
 //        List<WmsInCostcenterBackItem> list = new ArrayList<>();
 //        for (int i = 0, count = RandomUtil.randomInt(1, 100); i < count; i++) {
 //            list.add(new WmsInCostcenterBackItem().setMatnr(RandomUtil.randomNumbers(11)).setMaktx("非金属联件和紧固件等 M6 DIN 982 不锈钢304"));
 //        }
-        list.forEach(item -> item.setLgort(order.getLgort()));
         Map<String, String> base = new HashMap<>();
         base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
         base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
         Map<String, Object> variables = new HashMap<>();
         variables.put("info", order);
         variables.put("base", base);
-        variables.put("pages", PdfPageDTO.create(list, 17, new InCostcenterBackItemVO()));
+        variables.put("pages", PdfPageDTO.create(list, 17, new WmsInCostcenterBackItem()));
         String html = ThymeleafUtil.generator("/template/", "成本中心退料单", ".html", variables);
         PdfGeneratorUtil.generatePdf("成本中心领料单" + order.getNo(), html, response);
     }

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

@@ -433,7 +433,7 @@ public class InProduceOrderController extends BaseController {
                     materialNos.add(it.getMaterialNo());
                 }
                 //是否更改了储位
-                syncStorage(it, StrUtil.split(materialQO.getBinNos(), "/"));
+                syncStorage(it,materialQO.getBinNos());
             }
         });
         VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(materialNos))
@@ -457,7 +457,7 @@ public class InProduceOrderController extends BaseController {
         return ApiResult.success();
     }
 
-    private void syncStorage(InProduceOrderItemVO it, Collection<String> binNos) {
+    private void syncStorage(InProduceOrderItemVO it, Set<String> binNos) {
         produceOrderItemService.lambdaUpdate()
                 .set(WmsInProduceOrderItem::getBinNos, StrUtil.join(",", binNos))
                 .eq(WmsInProduceOrderItem::getId, it.getId())

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

@@ -121,7 +121,7 @@ public class MaterialController extends BaseController {
      */
     @Transactional
     @PostMapping("uploadZip")
-    public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotNull MultipartFile file) throws Exception {
+    public ApiResult uploadZip(HttpServletResponse response, @Valid @RequestParam("file") @NotEmpty MultipartFile file) throws Exception {
         return materialControllerService.uploadZip(response,file);
     }
 

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

@@ -612,11 +612,14 @@ public class StructuralPackageOrderController extends BaseController {
     @PostMapping("createDeliverOrder")
     public ApiResult<Void> createDeliverOrder(@Valid @RequestBody @NotEmpty List<Long> ids) {
         List<DeliverStructuralPackageOrderExtendVO> trays = deliverStructuralPackageOrderTrayService.getListByIds(ids);
-        VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getOrderId).collect(Collectors.toSet()).size() > 1)
+        VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getPackageNo).collect(Collectors.toSet()).size() > 1)
-                .throwMessage("订单号必须一致");
+                .throwMessage("钢构包必须一致");
-        Long orderId = trays.get(0).getOrderId();
+        VUtil.trueThrowBusinessError(trays.stream().map(DeliverStructuralPackageOrderExtendVO::getExternalOrderNo).collect(Collectors.toSet()).size() > 1)
+                .throwMessage("采购单号必须一致");
+        Long packageId = trays.get(0).getPackageId();
+        String externalOrderNo = trays.get(0).getExternalOrderNo();
         Long supplierId = trays.get(0).getSupplierId();
-        List<Long> tids = deliverStructuralPackageOrderTrayService.getIdsByOrderId(orderId);
+        List<Long> tids = deliverStructuralPackageOrderTrayService.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo);
         VUtil.trueThrowBusinessError(tids.size() != ids.size()).throwMessage("数据未齐套");
         String deliverOrderNo = serialNumberControllerService.generateSerialNumber(7);
         WmsStructuralPackageDeliverOrder deliverOrder = new WmsStructuralPackageDeliverOrder()
@@ -678,7 +681,7 @@ public class StructuralPackageOrderController extends BaseController {
         imageData.setRelativeLastColumnIndex(0);
         writeCellData.setImageDataList(List.of(imageData));
         info.put("qrCodeUrl", writeCellData);
-        UserSupplier supplier = userSupplierService.getById(deliverOrder.getSupplierId());
+        UserSupplier supplier = userSupplierService.getByUserId(deliverOrder.getSupplierId());
         VUtil.trueThrowBusinessError(Objects.isNull(supplier)).throwMessage("供应商不存在");
         info.put("supplierName", supplier.getSupplierName());
         info.put("abbreviation", supplier.getAbbreviation());
@@ -725,9 +728,6 @@ public class StructuralPackageOrderController extends BaseController {
             } else {
                 it.setWarehouseNo(dto.getWarehouseNo());
                 it.setBinNos(binService.getBinNos(it.getPackageNo(), dto.getWerks(), dto.getWarehouseNo()));
-//                if (dto.getTransportNum().compareTo(new BigDecimal(it.getNum()))<0){
-//                    it.setNum(dto.getTransportNum().intValue());
-//                }
             }
         });
         DeliverStructuralPackageOrderForPackageVO vo = new DeliverStructuralPackageOrderForPackageVO();
@@ -768,9 +768,6 @@ public class StructuralPackageOrderController extends BaseController {
                 .eq(WmsStructuralPackageOrderTray::getState, OrderState.InTransit.getState())
                 .update();
         structuralPackageDeliverOrderService.updateStateByOrderId(request.getId());
-        SAPMaterialInfoInOrderDTO dto = CollectionUtil.get(sapService.zim004(order.getExternalOrderNo(), order.getSupplierCode(), order.getPackageNo()), 0);
-        VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据");
-        VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空");
         //创建上架任务
         VUtil.trueThrowBusinessError(!inTaskService.generateTask(List.of(new WmsInTaskItem()
                         .setPoNum(order.getExternalOrderNo())
@@ -785,9 +782,9 @@ public class StructuralPackageOrderController extends BaseController {
                         .setUnqualifiedQty(BigDecimal.ZERO)
                         .setQualifiedQty(BigDecimal.valueOf(order.getNum()))
                         .setInspectionQty(BigDecimal.valueOf(order.getNum()))
-                        .setFactory(dto.getWerks())
+                        .setFactory("1010")
                         .setDataStatus((short) 0)
-                        .setReceivedWarehouse(dto.getWarehouseNo())
+                        .setReceivedWarehouse(storageService.getWarehouseNo("1010", order.getPackageNo()))
                         .setOperationUserId(UserUtil.getUserId())
                         .setOperationUserName(UserUtil.getUserName())
                         .setBatchNumber(order.getWorkbenchCode())
@@ -844,7 +841,6 @@ public class StructuralPackageOrderController extends BaseController {
                 it.setReceivedQty(it.getInspectionQty().subtract(qo.getNum()));
                 it.setBins(StrUtil.join(",", qo.getBinNos()));
                 it.setDataStatus((short) 1);
-                it.setReceivedWarehouse(qo.getReceivedWarehouse());
             });
             inTaskItemService.updateBatchById(datas);
             inTaskService.updateState(request.getTaskNo());

nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/PositionControllerService.java

@@ -86,7 +86,6 @@ public class PositionControllerService {
     public PageData<PositionVO> search(PositionSearchQO request) {
         return PageUtil.convert(positionService.lambdaQuery()
                         .like(StrUtil.isNotBlank(request.getName()), Position::getName, request.getName())
-                        .orderByDesc(Position::getId)
                         .page(new Page<>(request.getPage(), request.getPageSize())),
                 d -> Convert.convert(PositionVO.class, d));
     }

nflg-wms-admin/src/main/resources/template/钢构件老鼠图.html

@@ -36,7 +36,7 @@
 
         td {
             border: 1px solid #000;
-            padding: 7px;
+            padding: 8px;
         }
 
         tr:first-child td {
@@ -57,7 +57,7 @@
         }
 
         .data-item {
-            width: 33.16207%;
+            width: 33.15%;
             float: left;
             border-right: 1px solid #000;
         }
@@ -82,14 +82,7 @@
 
         .cell {
             border-bottom: 1px solid #000;
-            padding: 7px;
+            padding: 8px;
-            overflow: hidden;
-        }
-
-        .cell1 {
-            border-bottom: 1px solid #000;
-            padding: 7px;
-            height: 25px;
             overflow: hidden;
         }
 
@@ -131,19 +124,15 @@
     </table>
     <div class="data-item" th:each="item,itemStat : ${page.datas}"
          th:classappend="${itemStat.index % 3 == 0} ? 'data-item-row-first'">
-        <div class="cell" style="height: 150px;">
+        <div class="cell" style="height: 200px;">
             <div class="cell-img">
-                <img style="width: 200px;height: 130px;" alt=""
+                <img style="width: 200px;height: 180px;" alt=""
                      th:src="${!#strings.isEmpty(item.image)} ? ${item.image} : (${#strings.isEmpty(item.no)} ? '' : 'http://192.168.163.83:9090/nflg-wms/template/none.png')"/>
             </div>
         </div>
         <div class="cell">SAP编码：<span th:text="${item.no}">2222222222</span></div>
-        <div class="cell1">图号：<span
+        <div class="cell">图号：<span th:text="${item.drawingNo}">12255665451615</span></div>
-                th:text="${item.drawingNo}">图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号图号</span>
+        <div class="cell">名称：<span th:text="${item.name}">2222222222</span></div>
-        </div>
-        <div class="cell1">名称：<span
-                th:text="${item.name}">名称名称名称名称名称名称名称名称名称名名称名名称名称名称称名称名称名称称名称名称名称</span>
-        </div>
         <div class="cell">数量：<span th:text="${item.num}">1</span>&nbsp;&nbsp;&nbsp;&nbsp;重量：<span
                 th:text="${item.weight}">348.41</span></div>
     </div>

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

@@ -1,6 +1,5 @@
 package com.nflg.wms.common.pojo.qo;
 
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -19,8 +18,8 @@ public class InCostcenterBackSubmitItemQO {
     /**
      * 实际入库储位编号列表
      */
-    @NotBlank
+    @NotEmpty
-    private String binNos;
+    private List<String> binNos;
 
     /**
      * 二维码列表

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

@@ -5,6 +5,7 @@ import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Set;
 
 @Data
 public class InProduceOrderReceiveMaterialQO {
@@ -18,8 +19,8 @@ public class InProduceOrderReceiveMaterialQO {
     /**
      * 储位编号列表
      */
-    @NotBlank
+    @NotEmpty
-    private String binNos;
+    private Set<String> binNos;
 
     /**
      * 二维码列表

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

@@ -6,7 +6,7 @@ import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
+import java.util.Set;
 
 @Data
 public class MaterialStorageItemQO {
@@ -38,7 +38,7 @@ public class MaterialStorageItemQO {
      * 储位列表
      */
     @NotEmpty
-    private List<String> binNos;
+    private Set<String> binNos;
 
     /**
      * 越库数量

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderExtendVO.java

@@ -17,11 +17,6 @@ public class DeliverStructuralPackageOrderExtendVO extends DeliverStructuralPack
     @ExcelColumn(value = "序号",colIndex = 0)
     private Integer index;
 
-    /**
-     * 订单id
-     */
-    private Long orderId;
-
     /**
      * 托盘id
      */

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderTrayItemVO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Data
-@Accessors(chain = true)
+@Accessors
 public class DeliverStructuralPackageOrderTrayItemVO implements Serializable {
 
     /**

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/UserSupplierItemVO.java

@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
 import java.util.Collection;
 
 @Data
-@Accessors(chain = true)
+@Accessors
 public class UserSupplierItemVO {
     //所属角色
     private Collection<Long> roleIds;

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStorageMapper.java

@@ -26,7 +26,7 @@ public interface WmsStorageMapper extends BaseMapper<WmsStorage> {
 
     List<StorageVO> searchNonPage(@Param("request") StorageSearchQO request);
 
-    List<String> getWarehouseNo(String factoryNo, String materialNo);
+    String getWarehouseNo(String factoryNo, String materialNo);
 
     String getBinNos(String materialNo, String factoryNo, String warehouseNo);
 

nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsStructuralPackageOrderTrayMapper.java

@@ -33,5 +33,5 @@ public interface WmsStructuralPackageOrderTrayMapper extends BaseMapper<WmsStruc
 
     DeliverStructuralPackageOrderTrayVO getInfoByNo(String no);
 
-    List<Long> getIdsByOrderId(Long orderId);
+    List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo);
 }

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

@@ -37,7 +37,7 @@ public interface IWmsStorageService extends IService<WmsStorage> {
 
     List<StorageVO> searchNonPage(@Valid StorageSearchQO request);
 
-    List<String> getWarehouseNo(String factoryNo, String materialNo);
+    String getWarehouseNo(String factoryNo,String materialNo);
 
     Set<String> getBinNos(String materialNo, @NotBlank String factoryNo, String warehouseNo);
 

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

@@ -42,7 +42,7 @@ public interface IWmsStructuralPackageOrderTrayService extends IService<WmsStruc
 
     DeliverStructuralPackageOrderTrayVO getInfoByNo(@Valid @NotBlank String trayNo);
 
-    List<Long> getIdsByOrderId(Long orderId);
+    List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo);
 
     void setStateByIds(@Valid @NotEmpty List<Long> ids, OrderState state);
 }

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

@@ -69,7 +69,6 @@ public class ParamConfigServiceImpl extends ServiceImpl<ParamConfigMapper, Param
                 .like(StrUtil.isNotBlank(request.getName()), ParamConfig::getName, request.getName())
                 .like(StrUtil.isNotBlank(request.getCode()), ParamConfig::getCode, request.getCode())
                 .like(StrUtil.isNotBlank(request.getGroupName()), ParamConfig::getGroupName, request.getGroupName())
-                .orderByDesc(ParamConfig::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
         if (CollectionUtil.isEmpty(page.getRecords())) {
             return new PageData<>();

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

@@ -80,7 +80,6 @@ public class WebComponentServiceImpl extends ServiceImpl<WebComponentMapper, Web
                 .like(StrUtil.isNotBlank(request.getName()), WebComponent::getComponentName, request.getName())
                 .eq(StrUtil.isNotBlank(request.getModuleName()), WebComponent::getModuleName, request.getModuleName())
                 .eq(StrUtil.isNotBlank(request.getPageName()), WebComponent::getPageName, request.getPageName())
-                .orderByDesc(WebComponent::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
         Map<Long, String> userMap = new HashMap<>();
         return PageUtil.convert(page, (d) -> {

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

@@ -45,7 +45,6 @@ public class WmsGongzhuangTaizhangCheckServiceImpl extends ServiceImpl<WmsGongzh
     public IPage<WmsGongzhuangTaizhangCheck> search(GongZhuangTaiZhangCheckListQO request) {
         return lambdaQuery()
                 .eq(WmsGongzhuangTaizhangCheck::getNo, request.getNo())
-                .orderByDesc(WmsGongzhuangTaizhangCheck::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }

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

@@ -68,7 +68,6 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
         return lambdaQuery()
                 .like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
                 .like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
-                .orderByDesc(WmsGongzhuangTaizhang::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 

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

@@ -30,7 +30,6 @@ public class WmsInCostcenterBackServiceImpl extends ServiceImpl<WmsInCostcenterB
                 .like(StrUtil.isNotBlank(request.getKostl()), WmsInCostcenterBack::getKostl, request.getKostl())
                 .ge(request.getStartDate() != null, WmsInCostcenterBack::getCreateTime, request.getStartDate())
                 .le(request.getEndDate() != null, WmsInCostcenterBack::getCreateTime, request.getEndDate())
-                .orderByDesc(WmsInCostcenterBack::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }

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

@@ -33,7 +33,6 @@ public class WmsInProduceOrderServiceImpl extends ServiceImpl<WmsInProduceOrderM
                 )
                 .ge(Objects.nonNull(request.getStartDate()), WmsInProduceOrder::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsInProduceOrder::getCreateTime, request.getEndDate())
-                .orderByDesc(WmsInProduceOrder::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 

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

@@ -30,7 +30,6 @@ public class WmsOutPurchaseServiceImpl extends ServiceImpl<WmsOutPurchaseMapper,
                 .eq(StrUtil.isNotBlank(request.getLifnr()), WmsOutPurchase::getLifnr, request.getLifnr())
                 .ge(Objects.nonNull(request.getStartDate()), WmsOutPurchase::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsOutPurchase::getCreateTime, request.getEndDate())
-                .orderByDesc(WmsOutPurchase::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nflg.wms.common.pojo.qo.SRMOrderSearchQO;
 import com.nflg.wms.common.pojo.qo.SearchDeliverOrderQO;
+import com.nflg.wms.common.pojo.vo.PoReceiveTaskItemVO;
 import com.nflg.wms.common.pojo.vo.PoReceiveTaskVO;
 import com.nflg.wms.common.pojo.vo.SrmOrderVO;
 import com.nflg.wms.repository.entity.WmsSrmOrder;
@@ -33,7 +34,6 @@ public class WmsSrmOrderServiceImpl extends ServiceImpl<WmsSrmOrderMapper, WmsSr
                 .eq(StrUtil.isNotBlank(request.getOrderNo()),WmsSrmOrder::getNoteNum, request.getOrderNo())
                 .ge(Objects.nonNull(request.getStartDate()), WmsSrmOrder::getCreateTime, request.getStartDate())
                 .le(Objects.nonNull(request.getEndDate()), WmsSrmOrder::getCreateTime, request.getEndDate())
-                .orderByDesc(WmsSrmOrder::getId)
                 .page(new Page<>(request.getPage(),request.getPageSize()));
     }
 

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

@@ -94,7 +94,7 @@ public class WmsStorageServiceImpl extends ServiceImpl<WmsStorageMapper, WmsStor
     }
 
     @Override
-    public List<String> getWarehouseNo(String factoryNo, String materialNo) {
+    public String getWarehouseNo(String factoryNo,String materialNo) {
         return baseMapper.getWarehouseNo(factoryNo,materialNo);
     }
 

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

@@ -74,8 +74,8 @@ public class WmsStructuralPackageOrderTrayServiceImpl extends ServiceImpl<WmsStr
     }
 
     @Override
-    public List<Long> getIdsByOrderId(Long orderId) {
+    public List<Long> getIdsByMaterialAndExternalOrderNo(Long packageId, String externalOrderNo) {
-        return baseMapper.getIdsByOrderId(orderId);
+        return baseMapper.getIdsByMaterialAndExternalOrderNo(packageId, externalOrderNo);
     }
 
     @Override

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

@@ -45,9 +45,7 @@ public class WmsToolMaterialCheckServiceImpl extends ServiceImpl<WmsToolMaterial
 
     @Override
     public IPage<WmsToolMaterialCheck> search(GongZhuangTaiZhangCheckListQO request) {
-        return lambdaQuery()
+        return lambdaQuery().eq(WmsToolMaterialCheck::getNo, request.getNo())
-                .eq(WmsToolMaterialCheck::getNo, request.getNo())
-                .orderByDesc(WmsToolMaterialCheck::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }

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

@@ -45,9 +45,7 @@ public class WmsToolMaterialMaintainServiceImpl extends ServiceImpl<WmsToolMater
 
     @Override
     public IPage<WmsToolMaterialMaintain> search(GongZhuangTaiZhangCheckListQO request) {
-        return lambdaQuery()
+        return lambdaQuery().eq(WmsToolMaterialMaintain::getNo, request.getNo())
-                .eq(WmsToolMaterialMaintain::getNo, request.getNo())
-                .orderByDesc(WmsToolMaterialMaintain::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 }

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

@@ -63,7 +63,6 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
     public IPage<WmsToolMaterial> search(ToolMaterialSearchQO request) {
         return lambdaQuery()
                 .like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
-                .orderByDesc(WmsToolMaterial::getId)
                 .page(new Page<>(request.getPage(), request.getPageSize()));
     }
 

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

@@ -7,7 +7,6 @@
         from ad a
         inner join ad_sync ac on a.id = ac.ad_id
         where a.enable
-        order by a."id" desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.dto.AdDTO">

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

@@ -15,7 +15,6 @@
         FROM dictionary_item_translate t
             LEFT JOIN language l ON t.language_code=l.code
         WHERE t.dictionary_item_id=#{id}
-        ORDER BY t.id
     </select>
 
     <select id="getAllByDictionaryCode" resultType="com.nflg.wms.common.pojo.vo.DictionaryItemTranslateVO">
@@ -26,7 +25,6 @@
             LEFT JOIN dictionary_item_translate t ON t.dictionary_item_id=di.id AND t.language_code=#{language}
             LEFT JOIN "language" l ON t.language_code=l.code
         WHERE d.code=#{code}
-        ORDER BY t.id
     </select>
 
     <select id="getByDictionaryCode" resultType="com.nflg.wms.repository.entity.DictionaryItemTranslate">
@@ -35,6 +33,5 @@
                  INNER JOIN dictionary_item di on di.id=dit.dictionary_item_id
                  inner join dictionary d on di.dictionary_id=d.id
         WHERE d.code=#{dictionaryCode}
-        ORDER BY dit.id
     </select>
 </mapper>

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

@@ -7,6 +7,5 @@
         FROM "dictionary" d
         INNER JOIN dictionary_item di ON d."id"=di.dictionary_id
         WHERE d.code=#{code} AND di.code=#{itemCode}
-        order by di.id
     </select>
 </mapper>

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

@@ -11,7 +11,6 @@
         WHERE mb.enable = TRUE
           AND mb.menu_id = #{menuId}
           AND urm.user_id = #{userId}
-        order by mb.id
     </select>
 
     <select id="menuIsSelected" resultType="java.lang.Boolean">

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

@@ -10,7 +10,6 @@
                 AND name ilike CONCAT('%',#{request.name},'%')
             </if>
         </where>
-        ORDER BY id DESC
     </select>
 
     <select id="getMenusByRoleCodes" resultType="com.nflg.wms.common.pojo.vo.MenuVO">
@@ -23,6 +22,5 @@
           AND r.enable = TRUE
           AND urm.user_id = #{userId}
           AND m.service_desc_id = #{serviceId}
-        order by m.id
     </select>
 </mapper>

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

@@ -33,6 +33,5 @@
                 and vu.create_time <= #{request.endDate}
             </if>
         </where>
-        order by vu.id desc
     </select>
 </mapper>

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

@@ -7,7 +7,6 @@
         FROM user_role_map urm
                  INNER JOIN "role" r ON urm.role_id=r."id"
         WHERE urm.user_id=#{id}
-        ORDER BY r."id"
     </select>
 
     <select id="getAuthorizeUser" resultType="com.nflg.wms.common.pojo.vo.UserVO">
@@ -17,7 +16,6 @@
                  left join user_interior b on u."id"=b.user_id
                  left join department c on b.dept_id=c."id"
         where urm.role_id = #{roleId}
-        order by u.id
     </select>
 
     <select id="getAuthorizeRole" resultType="com.nflg.wms.common.pojo.vo.RoleSimpleVO">
@@ -25,6 +23,5 @@
         from user_role_map urm
         inner join role r on urm.role_id = r.id
         where urm.user_id = #{userId}
-        order by r.id
     </select>
 </mapper>

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

@@ -22,7 +22,6 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by bin.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.BinVO">

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

@@ -7,6 +7,5 @@
         FROM wms_bom b1
         INNER JOIN wms_bom b2 ON b2.parent_id=b1."id"
         WHERE b1."no"=#{materialNo}
-        ORDER BY b2.id
     </select>
 </mapper>

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

@@ -32,7 +32,7 @@
                 and datum <= #{request.endDate}
             </if>
         </where>
-        order by id desc
+        order by create_time desc
     </select>
 
     <select id="getOutboundTask" resultType="com.nflg.wms.common.pojo.vo.ComponentPackingPdaVO">

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

@@ -7,6 +7,5 @@
         FROM wms_in_costcenter_back_ticket_item icbti
         INNER JOIN wms_in_costcenter_back_item icbi ON icbti.order_item_id=icbi."id"
         WHERE icbti.ticket_id=#{id}
-        ORDER BY icbti.id desc
     </select>
 </mapper>

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

@@ -6,6 +6,5 @@
         select *
         from wms_in_produce_back_item
         where order_id=#{id}
-        order by id desc
     </select>
 </mapper>

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

@@ -8,6 +8,5 @@
         INNER JOIN wms_in_produce_back_item ipbi ON ipbti.produce_back_item_id=ipbi."id"
         inner join wms_in_produce_back ipb on ipb.id=ipbi.order_id
         WHERE ipbti.ticket_id=#{id}
-        ORDER BY ipbti.id
     </select>
 </mapper>

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

@@ -20,7 +20,6 @@
                 and ipbt.create_time <= #{request.endDate}
             </if>
         </where>
-        ORDER BY ipbt.id DESC
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.InProduceBackTicketVO">

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

@@ -7,6 +7,5 @@
         FROM wms_in_produce_order ipo
         INNER JOIN wms_in_produce_order_item ipoi ON ipo."id"=ipoi.order_id
         WHERE ipo."id"=#{id}
-        ORDER BY ipoi.id
     </select>
 </mapper>

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

@@ -27,7 +27,7 @@
                 and t."binNos" like concat('%', #{request.binNo}, '%')
             </if>
         </where>
-        order by t.id desc
+        order by id desc
     </select>
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.StorageVO">
@@ -41,7 +41,6 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by s.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.StorageVO">
@@ -69,7 +68,6 @@
                 and t."binNos" like concat('%', #{request.binNo}, '%')
             </if>
         </where>
-        order by t.id desc
     </select>
 
     <select id="getWarehouseNo" resultType="java.lang.String">
@@ -97,7 +95,6 @@
         FROM wms_storage s
         LEFT JOIN wms_warehouse wh ON s.warehouse_id = wh.id
         LEFT JOIN dictionary_item di ON wh.factory_id = di."id"
-        where s.sap_state != 1
+        where s.sap_state != 1;
-        order by s.id desc
     </select>
 </mapper>

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

@@ -19,6 +19,5 @@
         from wms_structural_package_order_tray ot
         inner join wms_structural_package_order_tray_item oti on ot."id"=oti.tray_id
         where ot.no=#{trayNo}
-        order by oti.id
     </select>
 </mapper>

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

@@ -42,9 +42,9 @@
     </select>
 
     <select id="getListByIds" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO">
-        SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",ot.order_id,o.*,m.no||wb."no" AS "workbench_code"
+        SELECT ROW_NUMBER() OVER (ORDER BY o.id desc) AS "index",o.*,m.no||wb."no" AS "workbench_code",us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no"
-        ,us.supplier_code,us.supplier_name,sp.order_no AS "package_order_no",sp."no" AS "package_no"
+        ,sp."no" AS "package_no",sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state
-        ,sp."name" AS "package_desc",m."no" AS "model_no",ot.no as "tray_no",ot.tray,ot.station,ot.state,ot.id as "tray_id"
+        ,ot.id as "tray_id"
         FROM wms_structural_package_order o
         LEFT JOIN wms_workbench wb ON o.workbench_id=wb."id"
         LEFT JOIN user_supplier us ON o.supplier_id=us.id
@@ -55,7 +55,6 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by o.id desc
     </select>
 
     <select id="getInfo" resultType="com.nflg.wms.common.pojo.vo.DeliverStructuralPackageOrderExtendVO">
@@ -91,9 +90,10 @@
         where ot.no=#{no}
     </select>
 
-    <select id="getIdsByOrderId" resultType="java.lang.Long">
+    <select id="getIdsByMaterialAndExternalOrderNo" resultType="java.lang.Long">
-        select id
+        select ot.id
-        from wms_structural_package_order_tray
+        from wms_structural_package_order o
-        where order_id=#{orderId}
+        inner join wms_structural_package_order_tray ot on o.id=ot.order_id
+        where o.external_order_no=#{externalOrderNo} and o.package_id=#{packageId}
     </select>
 </mapper>

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

@@ -17,7 +17,6 @@
                 and w.name ilike concat('%',#{request.name},'%')
             </if>
         </where>
-        order by w.id desc
     </select>
 
     <select id="getList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -28,7 +27,6 @@
         <foreach item="item" collection="ids" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by w.id desc
     </select>
 
     <select id="searchNonPage" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -43,7 +41,6 @@
                 and w.name ilike concat('%',#{request.name},'%')
             </if>
         </where>
-        order by w.id desc
     </select>
 
     <select id="getEnableList" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -54,7 +51,7 @@
         <if test="factoryNo!=null and factoryNo!=''">
             and di.code=#{factoryNo}
         </if>
-        order by di.code,w.id desc
+        order by w.id
     </select>
 
     <select id="getListByIds" resultType="com.nflg.wms.common.pojo.vo.WarehouseVO">
@@ -65,6 +62,5 @@
         <foreach item="item" collection="list" separator="," open="(" close=")">
             #{item}
         </foreach>
-        order by w.id desc
     </select>
 </mapper>