材料费明细加上物料编码

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/controller/ProjectCostHuijiController.java

@@ -50,6 +50,18 @@ public class ProjectCostHuijiController extends JeecgController<ProjectCostHuiji
 	@SuppressWarnings("all")
 	private IMesInfoInstallationcostService mesInfoInstallationcostService;
 
+	@ApiOperation(value="111111111111")
+	@GetMapping(value = "/children1")
+	public List<ProjectCostVO> children1(String taskno){
+		return costService.costListByTaskNoMain(taskno); //主任务及批产的主任务
+	}
+
+	@ApiOperation(value="22222222222222")
+	@GetMapping(value = "/children2")
+	public List<ProjectCostVO> children2(String taskno){
+		return costService.costListByTaskNoSub(taskno); //主任务及批产的主任务
+	}
+
 	/**
 	 * 项目成本汇集——对比
 	 */

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/xml/WzOutboundOrderBMapper.xml

@@ -22,7 +22,7 @@
 
     <!-- 根据出库单号集合查询物资出库明细 -->
     <select id="wzDetailList" resultMap="WzOutboundOrderBDetailListVO">
-        select id, ckdh, cgdj, nbdj, sfzsl from wz_outbound_order_b where ckdh in
+        select id, ckdh, wlbm, cgdj, nbdj, sfzsl from wz_outbound_order_b where ckdh in
         <foreach collection="ckDetailList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/vo/WzOutboundOrderBDetailListVO.java

@@ -20,6 +20,10 @@ public class WzOutboundOrderBDetailListVO implements Serializable {
     @Excel(name = "出库单号", width = 15)
     @ApiModelProperty(value = "出库单号")
     private java.lang.String ckdh;
+    /**物料编码*/
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private java.lang.String wlbm;
     /**采购单价*/
     @Excel(name = "采购单价", width = 15)
     @ApiModelProperty(value = "采购单价")