禅道bug修改

api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java

@@ -1,6 +1,7 @@
 package com.glxp.api.admin.controller.basic;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
@@ -49,6 +50,11 @@ public class BussinessOriginTypeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        if (StrUtil.isEmpty(bussinessTypeFilterRequest.getThirdSys())) {
+            return ResultVOUtils.error(500, "请先选择第三系统");
+        }
+
         List<BussinessOriginTypeEntity> bussinessTypeEntities;
         bussinessTypeEntities = bussinessOriginTypeService.filterEnableList(
                 bussinessTypeFilterRequest);

api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java

@@ -228,8 +228,9 @@ public class StockOrderServiceImpl implements StockOrderService {
             InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getCorpId());
             try {
                 //根据第三方系统标识，获取对应字段的值
-                String thirdSysFk = (String) ReflectUtil.getFieldValue(invWarehouseEntity, invWarehouseEntity.getClass().getField(thirdId));
-                ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseService.selectByCode(invWarehouseEntity.getThirdId(), thirdSysFk);
+//                String invWaThirdId = invWarehouseEntity.getClass().getField(thirdId);
+                String thirdSysFk = (String) ReflectUtil.getFieldValue(invWarehouseEntity, thirdId);
+                ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseService.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
                 udiwmsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); //往来单位编码，需转换为第三方系统的ID
                 udiwmsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); //往来单位名称，需转换为第三方系统的名称
             } catch (Exception e) {
@@ -252,8 +253,8 @@ public class StockOrderServiceImpl implements StockOrderService {
 
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode());
         try {
-            String thirdSysFk = (String) ReflectUtil.getFieldValue(invWarehouseEntity, invWarehouseEntity.getClass().getField(thirdId));
-            ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseService.selectByCode(invWarehouseEntity.getThirdId(), thirdSysFk);
+//            String thirdSysFk = (String) ReflectUtil.getFieldValue(invWarehouseEntity, invWarehouseEntity.getClass().getField(thirdId));
+            ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseService.selectByCode(invWarehouseEntity.getThirdId(), thirdId);
             udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
             udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
         } catch (Exception e) {
@@ -280,11 +281,11 @@ public class StockOrderServiceImpl implements StockOrderService {
             BeanUtil.copyProperties(stockOrderDetailEntity, item);
 
             try {
-                String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, udiRelevanceEntity.getClass().getField(thirdId));
+                String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdId);
                 item.setProductId(thirdProductId);
 
                 String thirdName = getThirdName(thirdId);
-                String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, udiRelevanceEntity.getClass().getField(thirdName));
+                String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdName);
                 item.setProductName(thirdProductName);
                 items.add(item);
             } catch (Exception e) {

api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml

@@ -69,6 +69,10 @@
                 concat(#{key},'%')) )
             </if>
 
+            <if test="thirdSys != ''and thirdSys != null">
+                AND basic_bustype_origin.thirdSys =#{thirdSys}
+            </if>
+
 
         </where>
     </select>
@@ -85,7 +89,8 @@
         #{remark},
         #{thirdSys},
         #{thirdSysName},
-        #{inoutType},#{updateTime}
+        #{inoutType},
+        #{updateTime}
         )
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -356,7 +356,7 @@
 
         </where>
         group by io_order.id
-        ORDER BY actDate DESC
+        ORDER BY actDate
     </select>