1.出库-新增界面单据类型下拉框默认状态

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/order/WmsDocOrderHeaderController.java

@@ -135,7 +135,7 @@ public class WmsDocOrderHeaderController extends BaseController {
             orderHeader.setOrderNo(orderNo);
             orderHeader.setCreateBy(loginUser.getUsername());
             orderHeader.setCreateTime(now);
-            orderHeader.setOrderType("OD");
+            orderHeader.setOrderType("");
             orderHeader.setOrderStatus("00");
             orderHeader.setCustomerId("");
             map.put("isAdd", true);

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -395,7 +395,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                                 unlockForm.setPalletNo(locIdLotattVO.getLotatt07());
                                 unlockForm.setSku(locIdLotattVO.getSku());
                                 unlockForm.setLotnum(locIdLotattVO.getLotnum());
-                                AjaxResult ajaxResult = unloadStock(unlockForm);
+                                 ajaxResult = unloadStock(unlockForm);
                                 if (!ajaxResult.isSuccess()) {
                                     throw new ServiceException("解绑老托盘失败：" + ajaxResult.getMsg());
                                 }

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -333,7 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInvLocIdLotattList" resultMap="InvLotLocIdLotattResult">
         select
         inv.location_id,sk.sku,sk.desc1 sku_name,sk.model sku_model,skt.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
-        ,att.lotnum, att.customer_id,w.box_no,w.is_full
+        ,att.lotnum, att.customer_id,w.box_no,w.is_full,
         b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06
         ,lotatt07, lotatt08, lotatt09, lotatt10, lotatt11, lotatt12, lotatt13, lotatt14, lotatt15, lotatt16, lotatt17