bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -19,12 +22,11 @@ import com.ruoyi.system.service.ISysMenuService;
 
 /**
  * 登录验证
- * 
+ *
  * @author ruoyi
  */
 @RestController
-public class SysLoginController
-{
+public class SysLoginController {
     @Autowired
     private SysLoginService loginService;
 
@@ -36,29 +38,30 @@ public class SysLoginController
 
     /**
      * 登录方法
-     * 
+     *
      * @param loginBody 登录信息
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody)
-    {
+    public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                 loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
+        Map<String, Object> param = new HashMap<>();
+        param.put(Constants.TOKEN, token);
+        ajax.put(AjaxResult.DATA_TAG, param);
         return ajax;
     }
 
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
-    public AjaxResult getInfo()
-    {
+    public AjaxResult getInfo() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
@@ -73,12 +76,11 @@ public class SysLoginController
 
     /**
      * 获取路由信息
-     * 
+     *
      * @return 路由信息
      */
     @GetMapping("getRouters")
-    public AjaxResult getRouters()
-    {
+    public AjaxResult getRouters() {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java

@@ -55,8 +55,6 @@ public class AjaxResult extends HashMap<String, Object>
         if (StringUtils.isNotNull(data))
         {
             super.put(DATA_TAG, data);
-        } else {
-            super.put(DATA_TAG, "");
         }
     }
 

ruoyi-ui/src/views/wms/allocation/index.vue

@@ -107,7 +107,7 @@
       <el-table-column label="分配数量" align="center" prop="qty" />
       <el-table-column label="lotnum" align="center" prop="lotnum" />
       <el-table-column label="拣货数量" align="center" prop="pickQty" />
-      <el-table-column label="拣货库位" align="center" prop="pickToLocation" />
+      <el-table-column label="已拣库位" align="center" prop="pickToLocation" />
       <el-table-column label="拣货事务" align="center" prop="pickTransactionId" />
       <!--<el-table-column label="待检库位" align="center" prop="locationId" />
       <el-table-column label="叫料待检事务id" align="center" prop="callTransactionId" />-->

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -162,8 +162,6 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
     @Transactional
     @Override
     public int updateWmsDocAsnHeader(WmsDocAsnHeader wmsDocAsnHeader) {
-        wmsDocAsnHeaderMapper.deleteWmsDocAsnDetailsByAsnNo(wmsDocAsnHeader.getAsnNo());
-        // insertWmsDocAsnDetails(wmsDocAsnHeader);
         return wmsDocAsnHeaderMapper.updateWmsDocAsnHeader(wmsDocAsnHeader);
     }
 
@@ -319,13 +317,13 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             if (wmsDocOrderHeader.getOrderStatus().equals("90") || wmsDocOrderHeader.getOrderStatus().equals("98") || wmsDocOrderHeader.getOrderStatus().equals("99")) {
                 return AjaxResult.error("出库单已完成");
             }
-
-            InvLotAtt queryAtt = new InvLotAtt();
+            //TODO 每个托盘只允许码一个出库单
+            /*InvLotAtt queryAtt = new InvLotAtt();
             queryAtt.setLotatt14(stockForm.getOrderNo());
             List<InvLotLocId> invList = invLotLocIdService.queryInvByInvLotatt(queryAtt, stockForm.getPalletNo());
-            if (invList != null && invList.size() > 0) {
-                throw new ServiceException("每个出库单只允许码一次");
-            }
+            if (invList != null && invList.size() > 1) {
+                throw new ServiceException("");
+            }*/
 
             orderDetails = wmsDocOrderHeader.getWmsDocOrderDetailsList();
 
@@ -362,6 +360,10 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             wmsDocOrderHeaderService.updateWmsDocOrderHeader(wmsDocOrderHeader);
         }
 
+        if (checkSameTypeByPalletNo(stockForm.getPalletNo(), codeSkuRelationshipVO.getSku()) == false) {
+            throw new ServiceException("不同的产品分类不允许放一个托盘上");
+        }
+
         if (codeSkuRelationshipVO.isProduct()) {
             stockForm.setQty(BigDecimal.ONE.toString());
             totalQty = BigDecimal.ONE;
@@ -373,10 +375,6 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             if (invList != null && invList.size() > 0) {
                 throw new ServiceException("每个成品条码只允许码一次");
             }
-
-            if (checkSameTypeByPalletNo(stockForm.getPalletNo(), codeSkuRelationshipVO.getSku()) == false) {
-                throw new ServiceException("不同的产品分类不允许放一个托盘上");
-            }
         }
 
         //匹配对应的入库单,出库单
@@ -447,6 +445,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                             lotattDTO.setLotatt05("90");
                             lotattDTO.setLotatt07(stockForm.getPalletNo());
                             lotattDTO.setLotatt08(details.getAsnNo());
+                            lotattDTO.setLotatt12("Y");
                             lotattDTO.setLotatt13(DateUtils.dateTimeNow(DateUtils.YYYY_MM_DD));
                             lotattDTO.setLotatt14(stockForm.getOrderNo());
                             String lotnum = invLotLocIdService.initInv(STAGE01, codeSkuRelationshipVO.getSku(), Constant.CUSTOMER_ID, current.doubleValue(), lotattDTO, BigDecimal.ZERO);

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/ActAllocationDetailsServiceImpl.java

@@ -138,9 +138,9 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
         int count = actAllocationDetailsMapper.insertActAllocationDetails(actAllocationDetails);
         if (count > 0) {
             //TODO 锁定库位(如果没有AGV需要把这部分去除)
-            BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(locationId));
+            /*BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(locationId));
             baseLocationInfo.setStockStatus("10");
-            baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo);
+            baseLocationInfoService.updateBaseLocationInfo(baseLocationInfo);*/
 
             return AjaxResult.success("分配明细生成成功", qty);
         } else {

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -361,7 +361,7 @@
     </insert>
 
     <select id="selectLineNo" parameterType="String" resultType="long">
-        select ifnull(max(asn_line_no),0) from wms_doc_asn_details where asn_no = #{asnNo}
+        select ifnull(max(order_line_no),0) from wms_doc_order_details where order_no = #{orderNo}
     </select>
 
     <select id="selectCheckOutList" resultMap="CheckOutVOResult">
@@ -376,7 +376,7 @@
         <foreach item="orderNo" collection="list" open="(" separator="," close=")">
             #{orderNo}
         </foreach>
-        and de.line_status = '40'
+        and de.line_status = '20'
         group by de.order_no,w.box_no,b.location_no
     </select>
 </mapper>

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseLocationInfoServiceImpl.java

@@ -328,7 +328,7 @@ public class BaseLocationInfoServiceImpl implements IBaseLocationInfoService {
             locationInfoFromUpdate.setStockStatus(stockStatus.getValue());
         }
         if (isYes != null) {
-            locationInfoFromUpdate.setIsEmpty(isYes.getValue());
+            locationInfoFromUpdate.setIsEmpty(isYes.toString());
         }
         locationInfoFromUpdate.setUpdateBy(updateBy);
         locationInfoFromUpdate.setWarehouseId(warehouseId);