oms-原始单证查询（部分）物料

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -102,4 +102,15 @@ public class BusinessDocumentOrderApplicationService {
         List<BusinessOrderAccount> businessOrderAccounts = businessOrderAccountMapper.selectList(new LambdaQueryWrapper<BusinessOrderAccount>().eq(BusinessOrderAccount::getOrderId, id).eq(BusinessOrderAccount::getIsDelete, 0));
         return businessOrderAccounts;
     }
+
+    public List<BusinessDocumentOrderPO> queryListAndMaterial(BusinessDocumentOrderDO businessDocumentOrderDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                businessDocumentOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return businessDocumentOrderDomainService.queryListAndMaterial(businessDocumentOrderDO);
+    }
 }

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

@@ -52,4 +52,6 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
     String selectByMakerCodeNc(String salesmanCodeNc);
 
     String selectByMakerCodeNc1(String salesmanCodeNc);
+
+    List<BusinessDocumentOrderPO> queryListAndMaterial(BusinessDocumentOrderDO businessDocumentOrderDO);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java

@@ -23,4 +23,5 @@ public interface BusinessDocumentOrderMapper extends BaseMapper<BusinessDocument
 
     String selectByMakerCodeNc1(@Param("salesmanCodeNc") String salesmanCodeNc);
 
+    List<BusinessDocumentOrderPO> queryListAndMaterial(BusinessDocumentOrderDO businessDocumentOrderDO);
 }

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

@@ -449,4 +449,10 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
         }
         return makerCodeNc;
     }
+
+    @Override
+    public List<BusinessDocumentOrderPO> queryListAndMaterial(BusinessDocumentOrderDO businessDocumentOrderDO)
+    {
+        return businessDocumentOrderMapper.queryListAndMaterial(businessDocumentOrderDO);
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -779,4 +779,8 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
 
     @ApiModelProperty("货物信息")
     private List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList;
+
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+
 }

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

@@ -804,4 +804,11 @@ public class BusinessDocumentOrderDomainService {
         }
         return null;
     }
+
+
+
+    public List<BusinessDocumentOrderPO> queryListAndMaterial(BusinessDocumentOrderDO businessDocumentOrderDO) {
+        return businessDocumentOrderService.queryListAndMaterial(businessDocumentOrderDO);
+    }
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 @Api(tags = "进出口原始单证")
 @RestController
-@RequestMapping("/OriginalImportExportDocument")
+@RequestMapping("/OriginalImportExportDocumentApi")
 public class OriginalImportExportDocumentApi extends BaseController {
 
     @Resource
@@ -37,7 +37,9 @@ public class OriginalImportExportDocumentApi extends BaseController {
                               @RequestParam(value = "pageSize",required = false , defaultValue = "10") Integer pageSize){
         BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO);
         PageHelper.startPage(pageNo,pageSize);
-        List<BusinessDocumentOrderPO> list = businessDocumentOrderApplicationService.queryList(businessDocumentOrderDO);
+        List<BusinessDocumentOrderPO> list = businessDocumentOrderApplicationService.queryListAndMaterial(businessDocumentOrderDO);
+
+
         return getDataTable(list);
     }
 

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="topOrganizationId"    column="TOP_ORGANIZATION_ID"    />
         <result property="documentDate"    column="DOCUMENT_DATE"    />
         <result property="ieType"    column="IE_TYPE"    />
+        <result property="materialCode"    column="MATERIAL_CODE"    />
     </resultMap>
 
 
@@ -685,4 +686,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             select DOCUMENT_PREPARER_NC_code from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>
     <select id="selectByMakerCodeNc1" resultType="java.lang.String" parameterType="java.lang.String">
         select  SALESPERSON_NC_CODE from NGWL_TEST_USER."USER" where USER_ID = #{salesmanCodeNc}</select>
+
+    <select id="queryListAndMaterial" parameterType="com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO" resultMap="BusinessDocumentOrderResult">
+        select o.*,a.material_code
+        from business_document_order as o
+        left join business_document_cargo_multi as a ON o.id = a.order_id
+<include refid="selectBusinessDocumentOrderPo1"/>
+        order by create_time desc
+    </select>
+
 </mapper>