新增发货的时候添加物料名称

src/main/java/com/boco/nbd/wios/flow/controller/FlowOrderController.java

@@ -16,6 +16,8 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.flow.util.ValidUtil;
 import com.boco.nbd.wios.flow.util.ValidUtil;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.flow.entity.pdf.BlockPairBo;
 import com.boco.nbd.wios.flow.entity.pdf.BlockPairBo;
+import com.boco.nbd.wios.manage.entity.bo.MaterialsEx;
+import com.boco.nbd.wios.manage.mapper.extdb.MaterialsMapperEx;
 import com.boco.nbd.wios.manage.service.impl.OrderInvoiceService;
 import com.boco.nbd.wios.manage.service.impl.OrderInvoiceService;
 import com.ihidea.core.support.session.SessionInfo;
 import com.ihidea.core.support.session.SessionInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -28,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 import springfox.documentation.annotations.ApiIgnore;
 
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.List;
 import java.util.List;
@@ -53,6 +56,8 @@ public class FlowOrderController {
 
 
     @Autowired
     @Autowired
     private OrderInvoiceService orderInvoiceService;
     private OrderInvoiceService orderInvoiceService;
+    @Resource
+    MaterialsMapperEx materialsMapperEx;
 
 
     @PostMapping(value = "order/pushSapOrder")
     @PostMapping(value = "order/pushSapOrder")
     @ApiOperation(value = "同步订单到sap")
     @ApiOperation(value = "同步订单到sap")
@@ -191,6 +196,12 @@ public class FlowOrderController {
     @ApiOperation("获取可以发货的订单列表")
     @ApiOperation("获取可以发货的订单列表")
     public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
     public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
         List<OrderPO> list=flowOrderMapper.getCanDeliveryOrder(orderId);
         List<OrderPO> list=flowOrderMapper.getCanDeliveryOrder(orderId);
+        list.stream().forEach(i->{
+            MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(i.getItemModel());
+           if (materials!=null){
+               i.setMaterialName(materials.getMaterialsName());
+           }
+        });
         if ("品牌墙盒".equals(isproduct)){
         if ("品牌墙盒".equals(isproduct)){
             List<OrderPO> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
             List<OrderPO> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
             return ResponseMessage2.Success2(has);
             return ResponseMessage2.Success2(has);

src/main/java/com/boco/nbd/wios/flow/entity/po/OrderPO.java

@@ -713,6 +713,9 @@ public class OrderPO implements Serializable {
     @ApiModelProperty(value = "流程标识信息字段", hidden = true)
     @ApiModelProperty(value = "流程标识信息字段", hidden = true)
     @Transient
     @Transient
     private String message;
     private String message;
+    @Column(name = "material_name")
+    @ApiModelProperty(value = "物料名称", required = true)
+    private String materialName;
 
 
 
 
     /**
     /**