1.修复盘点转单bug

api-admin/src/main/java/com/glxp/api/admin/dao/inout/CodesDao.java

@@ -51,4 +51,12 @@ public interface CodesDao {
      * @param id
      */
     void deleteById(@Param("id") Long id);
+
+    /**
+     * 根据条码查询供应商ID信息
+     *
+     * @param code
+     * @return
+     */
+    String selectSupIdByCode(String code);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.constant.ConstantType;
 import com.glxp.api.admin.dao.basic.BussinessTypeDao;
 import com.glxp.api.admin.dao.basic.UnitMaintainDao;
+import com.glxp.api.admin.dao.inout.CodesDao;
 import com.glxp.api.admin.dao.inout.CodesTempDao;
 import com.glxp.api.admin.dao.inout.OrderDao;
 import com.glxp.api.admin.dao.inventory.*;
@@ -72,6 +73,8 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     private CodesTempDao codesTempDao;
     @Resource
     private InvCountCodesService invCountCodesService;
+    @Resource
+    private CodesDao codesDao;
 
     @Override
     public List<InvCountOrderResponse> filterList(FilterInvCountOrderRequest filterInvCountOrderRequest) {
@@ -298,7 +301,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
                 warehouseEntity.setFromCorpId(order.getFromCorpId());
                 warehouseEntity.setCorpOrderId(order.getCorpOrderId());
                 //设置供应商信息
-                //invProductDetailDao.select
+
                 warehouseEntity.setSupId("");
             });
 
@@ -310,15 +313,16 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
         if (CollUtil.isNotEmpty(outOrderCodes)) {
             log.info("盘点单据：{} 生成盘亏入库单据", invCountOrder.getOrderId());
             OrderEntity order = createOrder(invCountSettingEntity, invCountOrder, ConstantType.TYPE_OUT);
-            log.info("盘盈入库单据号：{}", order.getId());
+            log.info("盘亏入库单据号：{}", order.getId());
             outOrderCodes.forEach(warehouseEntity -> {
                 warehouseEntity.setOrderId(order.getId());
                 warehouseEntity.setAction(order.getAction());
                 warehouseEntity.setFromCorp(order.getFromCorp());
                 warehouseEntity.setFromCorpId(order.getFromCorpId());
                 warehouseEntity.setCorpOrderId(order.getCorpOrderId());
+                String supId = codesDao.selectSupIdByCode(warehouseEntity.getCode());
+                warehouseEntity.setSupId(supId);
             });
-
             orderDao.insertOrder(order);
             codesTempDao.insertCodesTemp(outOrderCodes);
             log.info("盘亏入库单据生成成功");
@@ -383,7 +387,7 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
 
         //构造单据数据
         OrderEntity orderEntity = new OrderEntity();
-        orderEntity.setMainAction(ConstantType.TYPE_PUT);
+        orderEntity.setMainAction(type);
         orderEntity.setAction(invCountSettingEntity.getInAction());
         orderEntity.setActDate(DateUtil.date().toString(DatePattern.NORM_DATETIME_PATTERN));
         orderEntity.setCreateTime(orderEntity.getActDate());

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

@@ -190,4 +190,7 @@
         where id = #{id}
     </delete>
 
+    <select id="selectSupIdByCode" resultType="java.lang.String">
+        select supId from io_codes where code = #{code} limit 1
+    </select>
 </mapper>