Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -302,7 +302,9 @@
                            on tpi.sku_id = tpoi.sku_id and tpi.non_std_code = tpoi.non_std_code and
                               tpi.cp_id = tpoi.cp_id
                  left join dkic_b.t_mst_warehouse as tmw on tmw.wh_id = tpi.wh_id
-        where tpoi.order_id = #{orderId}::uuid
+        where tpoi.flg_valid
+          and tpoi.item_qty > tpoi.outing_qty
+          and tpoi.order_id = #{orderId}::uuid
         order by tpoi.item_index
     </select>
 </mapper>

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -130,7 +130,7 @@ public class OrderService extends BaseService<Order> {
         // 获取单号
         Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.ORDER.getName(),false);
         orderVO.setOrderId(codeMap.get("outId").toString()).setOrderNo(codeMap.get("outNote").toString())
-                .setOrderType(Constant.DocumentType.ORDER_CHASE.getName());
+                .setOrderType(Constant.DocumentType.ORDER.getName());
         // 转化实体
         Order order = orderConvert.convertToPo(orderVO);
         // 订单总单保存