8/22 工位优化

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -332,6 +332,9 @@ public class IoOrderController extends BaseController {
 
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         //要是特殊往来信息没有就创建
+        if (addOrderRequest.getOrderType() != null){
+            orderEntity.setOrderType(addOrderRequest.getOrderType());
+        }
         orderEntity.setFromCorp(ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()));
         orderEntity.setAction(addOrderRequest.getAction());
         orderEntity.setMainAction(bussinessTypeEntity.getMainAction());

src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java

@@ -226,4 +226,9 @@ public class FilterOrderRequest extends ListPageRequest {
      * 产品类别
      */
     private Integer productType;
+
+    /**
+     * 工位编码
+     */
+    private String workPlaceCode;
 }

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -10,7 +10,7 @@
         sys_workplace_document.busName busTypeName,
         bc.name fromCorpName,
         sw.workplaceId workPlaceCode,
-        sw.workplaceName
+        sw.workplaceName,ico.id
         FROM io_collect_order ico
         left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode
         left join basic_corp bc on ico.fromCorp = bc.erpId

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

@@ -80,6 +80,9 @@
             <if test="fromCorp != null and fromCorp != ''">
                 AND io.fromCorp = #{fromCorp}
             </if>
+            <if test="workPlaceCode != null and workPlaceCode != ''">
+                AND io.workPlaceCode = #{workPlaceCode}
+            </if>
             <if test="invoiceEncode != null and invoiceEncode != ''">
                 AND ioi.invoiceEncode like concat('%', #{invoiceEncode}, '%')
             </if>