添加基础费用功能

nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java

@@ -585,6 +585,18 @@ public class InvoicingApi {
     }
 
 
+    /**
+     * 盘点单-查询盘点单信息-根据库房的id查询
+     * @param invoicingPddInfoEntity
+     * @return
+     */
+    @GetMapping(value = "/generatedPddInfo")
+    public Result<InvoicingPddInfoEntity> generatedPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
+        InvoicingPddInfoEntity pageList = invoicingApi.generatedPddInfo(invoicingPddInfoEntity);
+        return Result.OK(pageList);
+    }
+
+
 
     @ApiOperation(value="盘点单-添加盘点信息", notes="盘点单-添加盘点信息")
     @AutoLog(value = "盘点单-添加盘点信息",clientType="app", operateType = 3)

nursing-unit-common/src/main/java/com/nu/entity/InvoicingPddInfoEntity.java

@@ -49,7 +49,7 @@ public class InvoicingPddInfoEntity implements Serializable {
 	private java.lang.Double pdsl;
 	/**差额数量*/
 	private java.lang.Double cesl;
-	/**盘点类型  1盘盈单 2盘亏单 3作废*/
+	/**盘点类型  1盘盈单 2盘亏单 3作废 4正常*/
 	@Dict(dicCode = "pd_type")
 	private java.lang.String pdType;
 	/**备注信息*/
@@ -76,8 +76,19 @@ public class InvoicingPddInfoEntity implements Serializable {
 	private java.lang.String pddNo;
 	/**库存id*/
 	private java.lang.String ckId;
+	/**品牌*/
+	private java.lang.String brandType;
+	/**生产厂家*/
+	private java.lang.String manufacturer;
+	/**供应商id*/
+	private java.lang.String suppliersId;
+	/**供应商名称*/
+	private java.lang.String suppliersName;
+	/**销售价格*/
+	private java.lang.Double xsjg;
 
-
+	/**参数类型*/
 	private String paramType;
+	/**数量*/
 	private java.lang.Integer num;
 }

nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java

@@ -111,4 +111,6 @@ public interface IInvoicingApi {
     InvoicingPddInfoEntity savePddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity);
 
     void editXsjg(WarehouseMaterialInfoEntity warehouseMaterialInfoEntity);
+
+    InvoicingPddInfoEntity generatedPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/bizSuppliers/service/impl/NuBizSuppliersMaterialInfoServiceImpl.java

@@ -57,11 +57,11 @@ public class NuBizSuppliersMaterialInfoServiceImpl extends ServiceImpl<NuBizSupp
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         for(int i=0;i<list.size();i++){
             Map<String,String> mapAdd = (Map)list.get(i);
-            QueryWrapper<NuBizSuppliersInfo> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<NuBizSuppliersMaterialInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("wl_id", mapAdd.get("id"));
             queryWrapper.eq("suppliers_id", suppliersId);
-            NuBizSuppliersInfo nuBizSuppliersInfo = nuBizSuppliersInfoService.getOne(queryWrapper);
+            NuBizSuppliersMaterialInfo suppliersMaterialInfo = baseMapper.selectOne(queryWrapper);
-            if(nuBizSuppliersInfo == null){
+            if(suppliersMaterialInfo == null){
                 NuBizSuppliersMaterialInfo nuBizSuppliersMaterialInfo = new NuBizSuppliersMaterialInfo();
                 nuBizSuppliersMaterialInfo.setSuppliersId(suppliersId);
                 nuBizSuppliersMaterialInfo.setWlId(mapAdd.get("id"));

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

@@ -72,7 +72,7 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
     @ApiModelProperty(value = "出入库数量")
     private Double crkNum;
 	/**出入库类型 1入库*/
-	@Excel(name = "出入库类型 1入库", width = 15, dicCode = "crk_type")
+	@Excel(name = "出入库类型 1入库 4盘点", width = 15, dicCode = "crk_type")
 	@Dict(dicCode = "crk_type")
     @ApiModelProperty(value = "出入库类型 1入库")
     private java.lang.String crkType;
@@ -99,7 +99,7 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
     private Double gzsl;//挂账数量
     private String ddNo;//订单号
     private String cgBy;//采购人
-    private String pddType;//盘点类型 1盘盈 2盘亏
+    private String pdType;//盘点类型 1盘盈 2盘亏
 
 
     /**物料类别名称*/

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java

@@ -1434,7 +1434,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("wl_id",nuWarehouseMaterialCrkInfo.getWlId());
         queryWrapper.eq("nu_id",nuWarehouseMaterialCrkInfo.getNuId());
-        queryWrapper.eq("cgd_id",nuWarehouseMaterialCrkInfo.getCgdId());
+//        queryWrapper.eq("cgd_id",nuWarehouseMaterialCrkInfo.getCgdId());
         if(StringUtils.isNotBlank(crkInfoEntity.getCrkStatus())){
             queryWrapper.in("crk_status",crkInfoEntity.getCrkStatus());
 //        }else{
@@ -1761,6 +1761,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public InvoicingPddInfoEntity savePddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String qgdDate = new SimpleDateFormat("yyyyMMdd").format(new Date());
@@ -1786,7 +1787,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         pddInfo.setCategoryName(ckInfo.getCategoryName());
         pddInfo.setTypeName(ckInfo.getTypeName());
         pddInfo.setMedicationName(ckInfo.getMedicationName());
-        pddInfo.setNuId(sysUser.getId());
+        pddInfo.setNuId(invoicingPddInfoEntity.getNuId());
         pddInfo.setWlId(ckInfo.getWlId());
         pddInfo.setDqkcsl(ckInfo.getKcsl());
         pddInfo.setPdsl(invoicingPddInfoEntity.getPdsl());
@@ -1795,32 +1796,45 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         pddInfo.setCkId(invoicingPddInfoEntity.getCkId());
         pddInfo.setContent(invoicingPddInfoEntity.getContent());
         pddInfo.setPdType(invoicingPddInfoEntity.getPdType());
-        pddInfo.setNum(invoicingPddInfoEntity.getNum());
         pddInfoMapper.insert(pddInfo);
         pddXlhInt++;
         redisUtil.set("PDD"+qgdDate,pddXlhInt);
 
+        ckInfo.setKcsl(pddInfo.getPdsl());
+        mterialInfoMapper.updateById(ckInfo);
+
         //-------------------------记录出入库记录--------------------------
         NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo();
         crkInfo.setCreateBy(sysUser.getRealname());
         crkInfo.setCgdId(pddInfo.getId());
         crkInfo.setNuId(pddInfo.getNuId());
         crkInfo.setWlId(pddInfo.getWlId());
-        crkInfo.setCrkType("1");//请购单类型 此处是固定的
+        crkInfo.setCrkType("4");//盘点 此处是固定的
         crkInfo.setJhPic(pddInfo.getPicPath());//拣货图片
         crkInfo.setCzqkcl(pddInfo.getDqkcsl());//操作前库存量
         crkInfo.setDdwNum(pddInfo.getPdsl());//多单位时的数量
         crkInfo.setContent("盘点单："+pddNo);
-        crkInfo.setMaterialCategoryName(pddInfo.getCategoryName());//物料类别名称
+        crkInfo.setMaterialCategoryName(invoicingPddInfoEntity.getCategoryName());//物料类别名称
-        crkInfo.setMaterialTypeName(pddInfo.getTypeName());//物料类型名称
+        crkInfo.setMaterialTypeName(invoicingPddInfoEntity.getTypeName());//物料类型名称
-        crkInfo.setMaterialMedicationName(pddInfo.getMedicationName());//物料类型名称
+        crkInfo.setMaterialMedicationName(invoicingPddInfoEntity.getMedicationName());//物料类型名称
-        crkInfo.setMaterialName(pddInfo.getMaterialName());//物料名称
+        crkInfo.setMaterialName(invoicingPddInfoEntity.getMaterialName());//物料名称
         crkInfo.setMaterialUnits(pddInfo.getMaterialUnits());//物料单位
-        crkInfo.setMaterialNo(pddInfo.getMaterialNo());//物料编码
+        crkInfo.setMaterialNo(invoicingPddInfoEntity.getMaterialNo());//物料编码
-        crkInfo.setSpecificationModel(pddInfo.getSpecificationModel());//规格型号
+        crkInfo.setSpecificationModel(invoicingPddInfoEntity.getSpecificationModel());//规格型号
-        crkInfo.setMaterialImg(pddInfo.getMaterialImg());//物料图片
+        crkInfo.setMaterialImg(invoicingPddInfoEntity.getMaterialImg());//物料图片
+
+//        crkInfo.setOldPrice();
+        if(StringUtils.isNotBlank(ckInfo.getXsjg())){
+            crkInfo.setNewPrice(new BigDecimal(ckInfo.getXsjg()));
             crkInfo.setSalesUnitPrice(new BigDecimal(ckInfo.getXsjg()));//销售单价
-        crkInfo.setCrkNum(pddInfo.getCesl());
+        }
+        if(StringUtils.isNotBlank(invoicingPddInfoEntity.getPdType()) && StringUtils.equals("1",invoicingPddInfoEntity.getPdType())){
+            crkInfo.setCrkStatus("1");
+        }else if(StringUtils.isNotBlank(invoicingPddInfoEntity.getPdType()) && StringUtils.equals("2",invoicingPddInfoEntity.getPdType())){
+            crkInfo.setCrkStatus("3");
+        }
+        crkInfo.setDqkcl(ckInfo.getKcsl());
+        crkInfo.setCrkNum(invoicingPddInfoEntity.getCesl());
         crkInfo.setDdNo(pddNo);
         crkInfo.setCgBy(sysUser.getRealname());
         crkInfoMapper.insert(crkInfo);
@@ -1837,4 +1851,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         mterialInfoMapper.updateById(materialInfo);
     }
 
+    @Override
+    public InvoicingPddInfoEntity generatedPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
+        return pddInfoMapper.generatedPddInfo(invoicingPddInfoEntity);
+    }
+
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddInfo.java

@@ -84,8 +84,20 @@ public class NuInvoicingPddInfo implements Serializable {
     private java.lang.String pddNo;
     /**库存id*/
     private java.lang.String ckId;
-
+    /**盘点单id 废弃*/
     private String pddId;
+    /**品牌*/
+    private java.lang.String brandType;
+    /**生产厂家*/
+    private java.lang.String manufacturer;
+    /**供应商id*/
+    private java.lang.String suppliersId;
+    /**供应商名称*/
+    private java.lang.String suppliersName;
+
+
+
+
 
     @TableField(exist = false)
     private java.lang.Integer num;

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java

@@ -22,4 +22,6 @@ public interface NuInvoicingPddInfoMapper extends BaseMapper<NuInvoicingPddInfo>
     List<NuInvoicingPddInfo> queryPddStartByList(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);
 
     InvoicingPddInfoEntity getPddInfoById(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);
+
+    InvoicingPddInfoEntity generatedPddInfo(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml

@@ -37,4 +37,15 @@
     <select id="getPddInfoById" resultType="com.nu.entity.InvoicingPddInfoEntity">
         select * from nu_invoicing_pdd_info where ck_id = #{params.ckId} ORDER BY create_time desc limit 1
     </select>
+
+    <select id="generatedPddInfo" resultType="com.nu.entity.InvoicingPddInfoEntity">
+        select a.id,a.id as ckId,a.nu_id,a.wl_id,a.kcsl as dqkcsl,a.xsjg,b.material_name,b.material_no,b.specification_model,b.brand_type,b.manufacturer,b.material_img,
+               d.category_name,e.type_name,c.suppliers_id,c.suppliers_name
+        from nu_warehouse_material_info a
+                 LEFT JOIN nu_config_material_info b on a.wl_id = b.id
+                 left join nu_invoicing_cgd_info c on a.cgd_info_id = c.id
+                 left join nu_config_material_category d on b.category_id = d.id
+                 left join nu_config_material_type e on b.type_id = e.id
+        where a.id = #{params.id}
+    </select>
 </mapper>

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/entity/NuBaseInfo.java

@@ -145,6 +145,7 @@ public class NuBaseInfo implements Serializable {
     @ApiModelProperty(value = "负责人年龄")
     private java.lang.String fzrAge;
 
+    private BigDecimal jcfy;
     /**
      * 是否绑定护理单元支付中 Y支付中（有客户正在给护理单元充值） N没有人在绑定缴费（可以让用户绑定）
      */