修改采购单查询信息

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

@@ -266,8 +266,8 @@ public class InvoicingApi {
     @AutoLog(value = "采购单-清空全部采购信息",clientType="app")
     @ApiOperation(value="采购单-清空全部采购信息", notes="采购单-清空全部采购信息")
     @DeleteMapping(value = "/emptiedQgInfo")
-    public Result<String> emptiedQgInfo() {
+    public Result<String> emptiedQgInfo(@RequestParam(name="nuId",required=true) String nuId) {
-        invoicingApi.emptiedQgInfo();
+        invoicingApi.emptiedQgInfo(nuId);
         return Result.OK("清空成功!");
     }
 

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

@@ -118,6 +118,8 @@ public class CgdInfoEntity implements Serializable {
     private java.lang.String typeName;
     private java.lang.String medicationName;
     private java.lang.String materialUnits;
+    private BigDecimal xjOrgPrice;//机构物料采购小计
+    private BigDecimal xjSupPrice;//供应商物料到货小计
 
 
     // 格式化getter方法

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

@@ -77,6 +77,8 @@ public class CgdMainEntity implements Serializable {
     private String gysName;
     //    总价
     private BigDecimal totalPrice;
+    // 供应商改价后的价格总价
+    private BigDecimal arrivalTotlaPrice;
 	/**审核时间*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

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

@@ -38,7 +38,7 @@ public interface IInvoicingApi {
 
     void deleteQgInfoById(String id);
 
-    void emptiedQgInfo();
+    void emptiedQgInfo(String nuId);
 
     String voidedCgdMain(CgdMainEntity cgdMainEntity);
 

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

@@ -198,6 +198,10 @@ public class NuInvoicingCgdInfo implements Serializable {
     private String manufacturer;
     private String materialImg;
 
+    private BigDecimal xjOrgPrice;//机构物料采购小计
+    private BigDecimal xjSupPrice;//供应商物料到货小计
+
+
 
     @TableField(exist = false)
     private Double kcsl;

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

@@ -204,6 +204,8 @@ public class NuInvoicingCgdMain implements Serializable {
 
     //    总价
     private BigDecimal totalPrice;
+    // 供应商改价后的价格总价
+    private BigDecimal arrivalTotlaPrice;
 
     /**
      * 是否是新的单子 Y是  N不是

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

@@ -449,7 +449,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getNuId()),"nu_id",cgdMainEntityDto.getNuId());
-        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getIds()),"id",cgdMainEntityDto.getIds().split(","));
+        if(StringUtils.isNotBlank(cgdMainEntityDto.getIds())){
+            queryWrapper.in("id",cgdMainEntityDto.getIds().split(","));
+        }
         queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
         if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){
             if (cgdMainEntityDto.getCgdType().indexOf(",")>-1){
@@ -589,8 +591,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     }
 
     @Override
-    public void emptiedQgInfo() {
+    public void emptiedQgInfo(String nuId) {
-        qgdInfoMapper.delete(new QueryWrapper<QgdInfo>());
+        qgdInfoMapper.delete(new QueryWrapper<QgdInfo>().eq(StringUtils.isNotBlank(nuId),"nu_id",nuId));
     }
 
     @Override
@@ -1683,24 +1685,22 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 BigDecimal dj = params.getReferenceUnitPrice();
                 BigDecimal wlzj = sl.multiply(dj);
                 cgdInfo.setTotalPrice(wlzj);
+                cgdInfo.setXjOrgPrice(wlzj);
+                cgdInfo.setXjSupPrice(wlzj);
                 totalPrice = totalPrice.add(wlzj);
                 cgdInfoList.add(cgdInfo);
             }
             cgdMain.setQgdId(qgdId);
             cgdMain.setCgdInfoList(cgdInfoList);
             cgdMain.setTotalPrice(totalPrice);
+            cgdMain.setArrivalTotlaPrice(totalPrice);
             mapList.add(cgdMain);
         }
         redisUtil.set("qgd"+qgdDate,qgdXlhInt);
         System.out.println(mapList);
 
-        List<CgdMainEntity> cgdMainList = BeanUtil.copyToList(mapList,CgdMainEntity.class);
 
-
+        List<NuInvoicingCgdMain> mapList2 = mapList;
-
-
-
-        List<NuInvoicingCgdMain> mapList2 = BeanUtil.copyToList(cgdMainList,NuInvoicingCgdMain.class);
         for (NuInvoicingCgdMain cgdMain : mapList2){
             cgdMain.setIzNew("Y");
             List<NuInvoicingCgdInfo> cgdInfoList = cgdMain.getCgdInfoList();
@@ -1766,7 +1766,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Override
     public IPage<MaterialInfoEntity> getCkWlList(Page<MaterialInfoEntity> page, QueryWrapper<MaterialInfoEntity> queryWrapper) {
         queryWrapper.orderByAsc("pd_type");
-        queryWrapper.orderByDesc("d.create_time");
+        queryWrapper.orderByDesc("a.create_time");
         return configMaterialInfoMapper.getCkWlList(page,queryWrapper);
     }
 
@@ -1837,7 +1837,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         //-------------------------记录出入库记录--------------------------
         NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo();
         crkInfo.setCreateBy(sysUser.getRealname());
-        crkInfo.setCgdId(pddInfo.getId());
+        crkInfo.setCgdId(ckInfo.getCgdId());
         crkInfo.setNuId(pddInfo.getNuId());
         crkInfo.setWlId(pddInfo.getWlId());
         crkInfo.setCrkType("4");//盘点 此处是固定的

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/configSuppliersApply/service/impl/NuConfigSuppliersApplyServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -254,17 +255,25 @@ public class NuConfigSuppliersApplyServiceImpl extends ServiceImpl<NuConfigSuppl
     public void cgdQueren(CgdBeanDto cgdBeanDto) {
         List<CgdMainDto> list = cgdBeanDto.getList();
         for (CgdMainDto cgdMainDto : list) {
-            NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
-            cgdMain.setIzGysConfirmed(cgdMainDto.getIzGysConfirmed());
-            cgdMain.setId(cgdMainDto.getId());
-            cgdMainMapper.updateById(cgdMain);
             List<CgdInfoDto> cgdInfoList = cgdMainDto.getCgdInfoList();
+            BigDecimal totalPrice = new BigDecimal(0);
             for (CgdInfoDto cgdInfoDto : cgdInfoList) {
                 NuInvoicingCgdInfo cgdInfo = new NuInvoicingCgdInfo();
                 cgdInfo.setId(cgdInfoDto.getId());
                 cgdInfo.setArrivalPrice(cgdInfoDto.getArrivalPrice());
+                BigDecimal sl = new BigDecimal(cgdInfoDto.getPurchaseQuantity());
+                BigDecimal dj = cgdInfoDto.getArrivalPrice();
+                BigDecimal wlzj = sl.multiply(dj);
+                cgdInfo.setXjSupPrice(wlzj);
                 cgdInfoMapper.updateById(cgdInfo);
+                totalPrice = totalPrice.add(wlzj);
             }
+            //修改采购单总价
+            NuInvoicingCgdMain cgdMain = new NuInvoicingCgdMain();
+            cgdMain.setIzGysConfirmed(cgdMainDto.getIzGysConfirmed());
+            cgdMain.setId(cgdMainDto.getId());
+            cgdMain.setArrivalTotlaPrice(totalPrice);
+            cgdMainMapper.updateById(cgdMain);
         }
     }
 }