发运明细调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -841,12 +841,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	 /**
 	  * 订单数据明细展示
-	  * @param itemId
+	  * @param orderDataVo
 	  * @return
 	  */
 	 @ApiOperation(value="订单数据明细展示", notes="订单数据明细展示")
 	 @PostMapping(value = "/displayDetails")
-	 public Result<List<OrderDataVo>> displayDetails(@RequestBody List<String> itemId,String tOrf){
+	 public Result<List<OrderDataVo>> displayDetails(@RequestBody OrderDataVo orderDataVo){
 
 	 	Result<List<OrderDataVo>> result = new Result<>();
 	 	int m = 0;
@@ -859,6 +859,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		 Page<OrderDataVo> page = new Page<OrderDataVo>(1, -1);
 
+		 List<String> itemId = orderDataVo.getItemId();
 		 for(String ids:itemId){
 			 groupIdList.add(oConvertUtils.getId());
 			 String itemIdSplit[] = ids.split(",");
@@ -876,7 +877,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				 if(ids.contains(li.getSyOrderDataItemId())){
 					 li.setGroupId(groupIdList.get(m));
 				 }
-				 if(tOrf.equals("成衣")){
+				 if(orderDataVo.getReadyFabric().equals("成衣")){
 					 li.setMaterialComposition(li.getSpecificationAndModel());//取规格型号
 				 }else{
 					 li.setMaterialComposition(li.getInventoryName());//取存货名称

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/OrderDataVo.java

@@ -9,6 +9,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class OrderDataVo {
@@ -246,4 +247,9 @@ public class OrderDataVo {
     @Excel(name = "物料成分", width = 15)
     @ApiModelProperty(value = "物料成分")
     private java.lang.String materialComposition;
+
+
+    private List<String> itemId;
+
+    private String readyFabric;
 }