oms修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java

@@ -37,7 +37,7 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
 
     public Boolean execute(List<Long> ids);
 
-    public Boolean executeAndIssue(List<Long> ids);
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId);
 
     public Boolean cancelExecute(List<Long> ids) throws Exception;
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -228,7 +228,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean executeAndIssue(List<Long> ids) {
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         try {
             for (Long id:ids){
@@ -358,6 +358,10 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             tmsOrderAddDTO.setPayerType(0);
                             tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
                             tmsOrderAddDTO.setOrderSource("0");
+                            tmsOrderAddDTO.setOrganizationId(organizationId);
+                            String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
+
+                            tmsOrderAddDTO.setOrganizationName(orgName);
 
                             AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                             if(ajaxResult.get("code").toString().equals("200")){

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -733,8 +733,8 @@ public class BusinessDocumentOrderDomainService {
         return businessDocumentOrderService.execute(ids);
     }
 
-    public Boolean executeAndIssue(List<Long> ids) {
-        return businessDocumentOrderService.executeAndIssue(ids);
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
+        return businessDocumentOrderService.executeAndIssue(ids,organizationId);
     }
 
     public Boolean cancelExecute(List<Long> ids) throws Exception {

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java

@@ -35,7 +35,7 @@ public interface IExecuteOrderService extends IService<ExecuteOrder>
      */
     public Boolean delete(Long[] ids);
 
-    public Boolean issueDocuments(List<Long> ids);
+    public Boolean issueDocuments(List<Long> ids,Long organizationId);
 
     public Boolean cancelIssueDocuments(List<Long> ids);
 

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java

@@ -19,4 +19,5 @@ public interface ExecuteOrderMapper extends BaseMapper<ExecuteOrder>
      */
     public List<ExecuteOrderPO> queryList(ExecuteOrderDO executeOrderDO);
 
+    String getOrgNameByOrgId(@Param("organizationId") Long organizationId);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -117,7 +117,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean issueDocuments(List<Long> ids) {
+    public Boolean issueDocuments(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);
@@ -203,7 +203,10 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setPayerType(0);
                     tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
                     tmsOrderAddDTO.setOrderSource("0");
-//                    tmsOrderAddDTO.setOrganizationId(organizationId);
+                    tmsOrderAddDTO.setOrganizationId(organizationId);
+                    String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
+
+                    tmsOrderAddDTO.setOrganizationName(orgName);
 
                     AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                     if(ajaxResult.get("code").toString().equals("200")){

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java

@@ -57,8 +57,8 @@ public class ExecuteOrderDomainService {
      * @param ids
      * @return
      */
-  public Boolean issueDocuments(List<Long> ids) {
-        return executeOrderService.issueDocuments(ids);
+  public Boolean issueDocuments(List<Long> ids,Long organizationId) {
+        return executeOrderService.issueDocuments(ids,organizationId);
     }
 
     public Boolean cancelIssueDocuments(List<Long> ids) {

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java

@@ -428,4 +428,5 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     @ApiModelProperty("调整后面积")
     @Excel(name = "调整后面积")
     private BigDecimal adjustedArea;
+
 }