1、修改了供应商的代码

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

@@ -666,7 +666,7 @@ public class NormalPGIController extends BaseController {
         // 查找订单信息
         List<WmsSrmOrderItem> items = wmsSrmOrderItemService.lambdaQuery()
                 .in(WmsSrmOrderItem::getOrderId, request.getId())
-                .apply(" deliveryQty>receiptQty")
+                .apply(" delivery_qty>receipt_qty")
                 .list();
         VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(items)).throwMessage("不存在未收货的物料!");
         for (WmsSrmOrderItem item : items) {
@@ -682,12 +682,12 @@ public class NormalPGIController extends BaseController {
             qo.setLineNumber(item.getLineNumber());
             qo.setNoteNum(item.getNoteNum());
             qo.setItemCode(item.getItemCode());
-            qo.setUnRecieveQty(item.getOrderQty().subtract(item.getReceiptQty()));
+            qo.setUnRecieveQty(item.getDeliveryQty().subtract(item.getReceiptQty()));
             qo.setDeliveryQty(item.getDeliveryQty());
             qo.setSerialNumbers("");
             qo.setIuCode(order.getIuCode());
             qo.setSupplierNum(order.getSupplierNum());
-            qo.setReceiptQty(item.getReceiptQty());
+            qo.setReceiptQty(item.getDeliveryQty().subtract(item.getReceiptQty()));
             // 获取当前订单的物料属性
             SAPSyncParamsDTO materialInfoInOrder = sapCommonService.getMaterialInfoInOrder(item.getPoNum(),
                     order.getSupplierNum(),
@@ -795,6 +795,14 @@ public class NormalPGIController extends BaseController {
         return srmMaterialReceiptScanCodes;
     }
 
+
+
+    /**
+     * 一键收货（无码）
+     *
+     * @param request
+     * @return
+     */
     @PostMapping("takeDeliveryByNoScan")
     @ApiMark(moduleName = "送货单管理", apiName = "一键收货")
     public ApiResult<Void> takeDeliveryByNoScan(@Valid @RequestBody List<BarcodeLessReceivingVO> request) {
@@ -903,7 +911,7 @@ public class NormalPGIController extends BaseController {
     }
 
     /**
-     * 采购物料入库确认（无码）
+     * 采购物料上架确认（无码）
      *
      * @param request
      * @return

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

@@ -358,7 +358,7 @@ public class UserControllerService {
                     .throwMessage("必须设置供应商的权限");
 
             pwd = RandomUtil.randomString(6);
-            useId = addUser(request.getSupplierName(), request.getPciPhone(), request.getEnable() ? 1 : 2,
+            useId = addUser(request.getSupplierName(), request.getPhone(), request.getEnable() ? 1 : 2,
                     request.getAvatar(), request.getRemark(), request.getSupplierCode(), pwd, request.getEnableMustResetPwd(),
                     request.getRoleIds());
         }
@@ -369,8 +369,8 @@ public class UserControllerService {
                 .setAbbreviation(request.getAbbreviation())
                 .setAbbreviation1(request.getAbbreviation1())
                 .setAbbreviation2(request.getAbbreviation2())
-                .setPciName(request.getPciName())
+                .setPciName(request.getUserName())
-                .setPciPhone(request.getPciPhone())
+                .setPciPhone(request.getPhone())
                 .setState(request.getEnable() ? 1 : 2)
                 .setIsOpenAccount(request.getIsOpenAccount())
                 .setDefaultLanguage(request.getDefaultLanguage())
@@ -410,7 +410,7 @@ public class UserControllerService {
                                 .exists())
                         .throwMessage("登录账号已存在");
                 pwd = RandomUtil.randomString(6);
-                useId = addUser(request.getSupplierName(), request.getPciPhone(), request.getEnable() ? 1 : 2,
+                useId = addUser(request.getSupplierName(), request.getPhone(), request.getEnable() ? 1 : 2,
                         request.getAvatar(), request.getRemark(), request.getSupplierCode(), pwd, request.getEnableMustResetPwd(),
                         request.getRoleIds());
             } else {
@@ -425,7 +425,7 @@ public class UserControllerService {
                 uService.lambdaUpdate().eq(User::getId, request.getId())
                         .set(User::getState, 1)
                         .set(User::getUserName, request.getSupplierName())
-                        .set(User::getPhone, request.getPciPhone())
+                        .set(User::getPhone, request.getPhone())
                         .set(User::getLanguageCode, request.getDefaultLanguage())
                         .set(User::getAvatar, request.getAvatar())
                         .set(User::getRemark, request.getRemark())
@@ -452,8 +452,8 @@ public class UserControllerService {
                 .set(UserSupplier::getTypeId, request.getTypeId())
                 .set(UserSupplier::getSupplierCode, request.getSupplierCode())
                 .set(UserSupplier::getState, request.getEnable() ? 1 : 2)
-                .set(UserSupplier::getPciPhone, request.getPciPhone())
+                .set(UserSupplier::getPciPhone, request.getPhone())
-                .set(UserSupplier::getPciName, request.getPciName())
+                .set(UserSupplier::getPciName, request.getUserName())
                 .set(UserSupplier::getAbbreviation2, request.getAbbreviation2())
                 .set(UserSupplier::getAbbreviation1, request.getAbbreviation1())
                 .set(UserSupplier::getAbbreviation, request.getAbbreviation())
@@ -469,12 +469,8 @@ public class UserControllerService {
         UserSupplier userSupplier = userSupplierService.getById(request.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(userSupplier) || StrUtil.isBlank(userSupplier.getSupplierCode()))
                 .throwMessage("供应商不存在");
-        if (request.getEnable()) {
+        if (userSupplier.getIsOpenAccount()) {
-            if (userSupplier.getIsOpenAccount()) {
+            enableUser(userSupplier.getUserId(),request.getEnable()?1:2);
-                enableUser(request.getId(), 2);
-            }
-        } else {
-            enableUser(request.getId(), 1);
         }
         userSupplierService.lambdaUpdate().set(UserSupplier::getState, request.getEnable() ? 1 : 2)
                 .set(UserSupplier::getUpdateBy, UserUtil.getUserName())
@@ -488,10 +484,10 @@ public class UserControllerService {
         UserSupplier userSupplier = userSupplierService.getById(id);
         if (!userSupplier.getUserId().equals(0L)) {
             userRoleMapService.deleteByUser(id);
-            uService.delete(id);
+            uService.delete(userSupplier.getUserId());
-            StpUtil.logout(id);
+            StpUtil.logout(userSupplier.getUserId());
         }
-        userSupplierService.remove(new LambdaQueryWrapper<UserSupplier>().eq(UserSupplier::getUserId, id));
+        userSupplierService.remove(new LambdaQueryWrapper<UserSupplier>().eq(UserSupplier::getId, id));
     }
 
     public IPage<UserSupplierVO> searchSupplier(@Valid UserSupplierSearchQO request) {

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

@@ -39,12 +39,12 @@ public class SupplierAddQO {
     /**
      * 负责人姓名
      */
-    private String pciName;
+    private String userName;
 
     /**
      * 负责人电话
      */
-    private String pciPhone;
+    private String phone;
 
     /**
      * 供应商类别

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

@@ -39,6 +39,10 @@ public class UserSupplierVO {
      */
     private Long typeId;
 
+    /**
+     * 供应商类别名称
+     */
+    public String typeName;
     /**
      * 简称全拼
      */