فهرست منبع

询价单列表物料单位

chenw 7 سال پیش
والد
کامیت
1948a023f4

+ 1 - 2
applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -132,8 +132,7 @@ public class ProductController {
      */
     @GetMapping("/getByProdCode")
     public Result getByProdCode(@RequestParam("code") String code){
-        productService.getByProdCode(code);
-        return Result.success();
+        return Result.success(productService.getByProdCode(code));
     }
 
     /**

+ 4 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -1024,7 +1024,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         for (PurcInquiryItemInfo purcInquiryItemInfo : purcInquiryItemInfoList){
             InquiryRspDTO inquiryRspDTO = new InquiryRspDTO();
             inquiryRspDTO.setProdCode(purcInquiryItemInfo.getProdCode());
-            inquiryRspDTO.setProdUnit(purcInquiryItemInfo.getProduct().getUnit());
+            ProductDTO productDTO = productApi.getByProdCode(purcInquiryItemInfo.getProdCode()).getData();
+            if (productDTO != null) {
+                inquiryRspDTO.setProdUnit(productDTO.getPr_unit());
+            }
             inquiryRspDTO.setProdOrispeccode(purcInquiryItemInfo.getCmpCode());
             inquiryRspDTO.setProdBrand(purcInquiryItemInfo.getProduct().getBrand());
             inquiryRspDTO.setProdName(purcInquiryItemInfo.getProdTitle());