Merge branch 'xuankuang' of http://47.100.220.92:10001/WAREWMS/WAREAMS into xuankuang

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderDetailsService.java

@@ -94,7 +94,7 @@ public interface IWmsDocOrderDetailsService {
      * @param quantityDecimal
      * @return
      */
-    Boolean createOrderDetail(String orderNo, String sku, BigDecimal quantityDecimal);
+    WmsDocOrderDetails createOrderDetail(String orderNo, String sku, BigDecimal quantityDecimal);
 
     /**
      * 创建出库单详情
@@ -104,5 +104,5 @@ public interface IWmsDocOrderDetailsService {
      * @param quantityDecimal
      * @return
      */
-    Boolean createOrderDetail(String orderNo, BigDecimal lineNo, String sku, BigDecimal quantityDecimal);
+    WmsDocOrderDetails createOrderDetail(String orderNo, BigDecimal lineNo, String sku, BigDecimal quantityDecimal);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderHeaderService.java

@@ -215,5 +215,5 @@ public interface IWmsDocOrderHeaderService {
      * @param orderStatus
      * @return
      */
-    Boolean createOrderHeader(String orderNo, String orderType, String orderStatus);
+    WmsDocOrderHeader createOrderHeader(String orderNo, String orderType, String orderStatus);
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderDetailsServiceImpl.java

@@ -135,12 +135,12 @@ public class WmsDocOrderDetailsServiceImpl implements IWmsDocOrderDetailsService
     }
 
     @Override
-    public Boolean createOrderDetail(String orderNo, String sku, BigDecimal quantityDecimal){
+    public WmsDocOrderDetails createOrderDetail(String orderNo, String sku, BigDecimal quantityDecimal){
         return createOrderDetail(orderNo, BigDecimal.ONE, sku, quantityDecimal);
     }
 
     @Override
-    public Boolean createOrderDetail(String orderNo, BigDecimal lineNo, String sku, BigDecimal quantityDecimal) {
+    public WmsDocOrderDetails createOrderDetail(String orderNo, BigDecimal lineNo, String sku, BigDecimal quantityDecimal) {
         WmsDocOrderDetails wmsDocOrderDetails = new WmsDocOrderDetails();
         wmsDocOrderDetails.setOrderNo(orderNo);
         wmsDocOrderDetails.setOrderLineNo(lineNo);
@@ -149,7 +149,8 @@ public class WmsDocOrderDetailsServiceImpl implements IWmsDocOrderDetailsService
         wmsDocOrderDetails.setQtyOrderedEach(quantityDecimal);
         wmsDocOrderDetails.setCreateTime(new Date());
         wmsDocOrderDetails.setQtyOrdered(quantityDecimal);
-        return wmsDocOrderDetailsMapper.insertWmsDocOrderDetails(wmsDocOrderDetails) == 1;
+        wmsDocOrderDetailsMapper.insertWmsDocOrderDetails(wmsDocOrderDetails);
+        return wmsDocOrderDetails;
     }
 
 }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -719,13 +719,14 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     }
 
     @Override
-    public Boolean createOrderHeader(String orderNo, String orderType, String orderStatus) {
+    public WmsDocOrderHeader createOrderHeader(String orderNo, String orderType, String orderStatus) {
         WmsDocOrderHeader wmsDocOrderHeader = new WmsDocOrderHeader();
         wmsDocOrderHeader.setOrderNo(orderNo);
         wmsDocOrderHeader.setEdiSendFlag(Constants.NO);
         wmsDocOrderHeader.setOrderStatus(Constant.ORDER_STS.STS00.getValue());
         wmsDocOrderHeader.setCreateTime(DateUtil.date());
         wmsDocOrderHeader.setOrderType(Constant.ORDER_TYP.DZ.getValue());
-        return wmsDocOrderHeaderMapper.insertWmsDocOrderHeader(wmsDocOrderHeader) == 1;
+        wmsDocOrderHeaderMapper.insertWmsDocOrderHeader(wmsDocOrderHeader);
+        return wmsDocOrderHeader;
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/AgvCallProxyService.java

@@ -130,6 +130,7 @@ public class AgvCallProxyService {
 
         iWmsDocOrderHeaderService.createOrderHeader(orderNo, Constant.ORDER_TYP.TZ.getValue(), Constant.ORDER_STS.STS00.getValue());
         iWmsDocOrderDetailsService.createOrderDetail(orderNo, baseSku.getSku(), quantityDecimal);
+
     }
 
 

warewms-base/src/main/java/com/ruoyi/base/domain/BaseLocationZone.java

@@ -1,5 +1,7 @@
 package com.ruoyi.base.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -26,6 +28,7 @@ public class BaseLocationZone extends BaseEntity
     private Long warehouseId;
 
     @Excel(name = "所属仓库")
+    @TableField(exist = false)
     private String warehouseName;
 
     /** 状态（0正常 1停用） */