1、pad接口-退货单-入库操作：增加库房出入库信息相关物料信息

2、pad接口-请领单-确认收货操作：增加库房出入库信息相关物料信息

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java

@@ -96,6 +96,43 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
 
     private Integer ddwNum;//多单位时的数量
 
+    /**物料类别名称*/
+    @Excel(name = "物料类别名称", width = 15)
+    @ApiModelProperty(value = "物料类别名称")
+    private java.lang.String materialCategoryName;
+    /**物料类型名称*/
+    @Excel(name = "物料类型名称", width = 15)
+    @ApiModelProperty(value = "物料类型名称")
+    private java.lang.String materialTypeName;
+    /**用药类型名称*/
+    @Excel(name = "用药类型名称", width = 15)
+    @ApiModelProperty(value = "用药类型名称")
+    private java.lang.String materialMedicationName;
+    /**物料名称*/
+    @Excel(name = "物料名称", width = 15)
+    @ApiModelProperty(value = "物料名称")
+    private java.lang.String materialName;
+    /**物料单位*/
+    @Excel(name = "物料单位", width = 15)
+    @ApiModelProperty(value = "物料单位")
+    private java.lang.String materialUnits;
+    /**物料编码*/
+    @Excel(name = "物料编码", width = 15)
+    @ApiModelProperty(value = "物料编码")
+    private java.lang.String materialNo;
+    /**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private java.lang.String specificationModel;
+    /**物料图片*/
+    @Excel(name = "物料图片", width = 15)
+    @ApiModelProperty(value = "物料图片")
+    private java.lang.String materialImg;
+    /**物料销售单价*/
+    @Excel(name = "物料销售单价", width = 15)
+    @ApiModelProperty(value = "物料销售单价")
+    private java.math.BigDecimal salesUnitPrice;
+
     @TableField(exist = false)
     private String paramDate;
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java

@@ -732,6 +732,16 @@ public class QingLingServiceImpl implements IQinglingApi {
             kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) - item.getQlNum()) + "");//当前库存量
             kfCrkLog.setCrkStatus("3");//出入库状态 3出库
             kfCrkLog.setContent("请领单：" + dto.getQldNo());//备注
+
+            kfCrkLog.setMaterialCategoryName(item.getMaterialCategoryName());//物料类别名称
+            kfCrkLog.setMaterialTypeName(item.getMaterialTypeName());//物料类型名称
+            kfCrkLog.setMaterialMedicationName(item.getMaterialMedicationName());//物料类型名称
+            kfCrkLog.setMaterialName(item.getMaterialName());//物料名称
+            kfCrkLog.setMaterialUnits(item.getMaterialUnits());//物料单位
+            kfCrkLog.setMaterialNo(item.getMaterialNo());//物料编码
+            kfCrkLog.setSpecificationModel(item.getSpecificationModel());//规格型号
+            kfCrkLog.setMaterialImg(item.getMaterialImg());//物料图片
+            kfCrkLog.setSalesUnitPrice(item.getSalesUnitPrice());//物料销售单价
             kfCrkLogList.add(kfCrkLog);
         });
         warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList);

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java

@@ -398,6 +398,16 @@ public class ThdServiceImpl implements ITuiHuoApi {
                     kfCrkLog.setDqkcl((Integer.parseInt(kfWlSlMap.get(item.getKfId()).get(item.getWlId())) + item.getThNum()) + "");//当前库存量
                     kfCrkLog.setCrkStatus("1");//出入库状态 1入库
                     kfCrkLog.setContent("退货单：" + thdNo);//备注
+
+                    kfCrkLog.setMaterialCategoryName(item.getMaterialCategoryName());//物料类别名称
+                    kfCrkLog.setMaterialTypeName(item.getMaterialTypeName());//物料类型名称
+                    kfCrkLog.setMaterialMedicationName(item.getMaterialMedicationName());//物料类型名称
+                    kfCrkLog.setMaterialName(item.getMaterialName());//物料名称
+                    kfCrkLog.setMaterialUnits(item.getMaterialUnits());//物料单位
+                    kfCrkLog.setMaterialNo(item.getMaterialNo());//物料编码
+                    kfCrkLog.setSpecificationModel(item.getSpecificationModel());//规格型号
+                    kfCrkLog.setMaterialImg(item.getMaterialImg());//物料图片
+                    kfCrkLog.setSalesUnitPrice(item.getSalesUnitPrice());//物料销售单价
                     kfCrkLogList.add(kfCrkLog);
                 }
                 warehouseMaterialCrkInfoService.saveBatch(kfCrkLogList);