现场管理业务名称

src/main/java/com/glxp/api/controller/collect/IoFifoDesOrderController.java

@@ -125,7 +125,7 @@ public class IoFifoDesOrderController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if (addInvDesDetaiRequest.getOutCount() == null && addInvDesDetaiRequest.getRemark() == null){
+        if (addInvDesDetaiRequest.getOutCount() == null && addInvDesDetaiRequest.getRemark() == null) {
             return ResultVOUtils.error("请输入损耗数量");
         }
         Boolean save = splitDesOrderService.destroyOut(addInvDesDetaiRequest);

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -280,6 +280,9 @@ public class IoOrderResponse {
      */
     private String splitBusType;
 
+
+    private String splitBusTypeName;
+
     public String getFromName() {
 
         if (StrUtil.isNotEmpty(fromCorpName))

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -14,7 +14,8 @@
         aw2.name AS fromInvName,
         bc1.name AS fromCorpName,
         bc2.name AS customerName,
-               sw.workplaceName AS workPlaceName
+        sw.workplaceName AS workPlaceName,
+        swd.busName AS splitBusTypeName
         FROM
         io_order io
         LEFT JOIN
@@ -56,9 +57,9 @@
             <if test="productType != null and productType != ''">
                 AND io.productType = #{productType}
             </if>
-<!--            <if test="keyWords != null and keyWords != ''">-->
+            <!--            <if test="keyWords != null and keyWords != ''">-->
-<!--                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))-->
+            <!--                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))-->
-<!--            </if>-->
+            <!--            </if>-->
 
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
@@ -584,7 +585,8 @@
         <where>
             basic_bussiness_type.inStock = 1
             and io_order.`status` = 7
-                    AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{firstData}, '%Y-%m-%d') and date_format(#{lastData}, '%Y-%m-%d')
+            AND date_format(io_order.updateTime, '%Y-%m-%d') between date_format(#{firstData}, '%Y-%m-%d') and
+            date_format(#{lastData}, '%Y-%m-%d')
 
             <if test="invCode != null and invCode != ''">
                 AND io_order.invCode = #{invCode}
@@ -658,10 +660,12 @@
                 AND io.relKey like concat('%', #{relKey}, '%')
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+                AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
+                AND date_format(io.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
+                date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">
                 AND io.`action` in