修改查询服务指令接口

nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/service/impl/NuBizNuCustomerServerServiceImpl.java

@@ -50,7 +50,7 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
             for(NuBizNuCustomerServer par : groupList){
                 if(StringUtils.equals(groupPositioning1,par.getPositioning())){
                     Map<String,Object> map = new HashMap<>();
-                    map.put("id",par.getId());
+                    map.put("directiveId",par.getId());
                     map.put("directiveName",par.getDirectiveName());
                     map.put("categoryName",par.getCategoryName());
                     map.put("typeName",par.getTypeName());
@@ -60,6 +60,8 @@ public class NuBizNuCustomerServerServiceImpl extends ServiceImpl<NuBizNuCustome
                     map.put("cycleType",par.getCycleType());
                     map.put("positioningLong",par.getPositioningLong());
                     map.put("positioning",par.getPositioning());
+                    map.put("nuId",nuBizNuCustomerServer.getNuId());
+                    map.put("customerId",nuBizNuCustomerServer.getCustomerId());
                     childrenList.add(map);
                 }
             }

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

@@ -71,4 +71,13 @@ public class ElderServerEntity implements Serializable {
     private Date updateTime;
 	/**所属部门*/
     private String sysOrgCode;
+
+    /**服务指令图片大图*/
+    private String previewFile;
+    /**服务指令图片小图*/
+    private String previewFileSmall;
+    /**即时指令图片*/
+    private String immediateFile;
+    /**即时指令焦点图片*/
+    private String immediateFileFocu;
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml

@@ -3,6 +3,13 @@
 <mapper namespace="com.nu.modules.elderinfo.mapper.ElderInfoMapper">
 
     <select id="getElderServerList" resultType="com.nu.entity.ElderServerEntity">
-        select * from nu_biz_nu_customer_server where nu_id = #{params.nuId} and customer_id = #{params.id}
+        select a.*,
+        b.preview_file,
+        b.preview_file_small,
+        b.immediate_file,
+        b.immediate_file_focus
+        from nu_biz_nu_customer_server a
+        left join nu_config_service_directive b on a.directive_id = b.id
+        where a.nu_id = #{params.nuId} and a.customer_id = #{params.id}
     </select>
 </mapper>

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuInvoicingCgdMainController.java

@@ -62,8 +62,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "nu_invoicing_cgd_main-分页列表查询")
-	@ApiOperation(value="nu_invoicing_cgd_main-分页列表查询", notes="nu_invoicing_cgd_main-分页列表查询")
+	//@AutoLog(value = "采购单-分页列表查询")
+	@ApiOperation(value="采购单-分页列表查询", notes="采购单-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<NuInvoicingCgdMain>> queryPageList(NuInvoicingCgdMain nuInvoicingCgdMain,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -81,8 +81,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param nuInvoicingCgdMain
 	 * @return
 	 */
-	@AutoLog(value = "nu_invoicing_cgd_main-添加")
-	@ApiOperation(value="nu_invoicing_cgd_main-添加", notes="nu_invoicing_cgd_main-添加")
+	@AutoLog(value = "采购单-添加")
+	@ApiOperation(value="采购单-添加", notes="采购单-添加")
 	@RequiresPermissions("cgd:nu_invoicing_cgd_main:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) {
@@ -96,8 +96,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param nuInvoicingCgdMain
 	 * @return
 	 */
-	@AutoLog(value = "nu_invoicing_cgd_main-编辑")
-	@ApiOperation(value="nu_invoicing_cgd_main-编辑", notes="nu_invoicing_cgd_main-编辑")
+	@AutoLog(value = "采购单-编辑")
+	@ApiOperation(value="采购单-编辑", notes="采购单-编辑")
 	@RequiresPermissions("cgd:nu_invoicing_cgd_main:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) {
@@ -111,8 +111,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "nu_invoicing_cgd_main-通过id删除")
-	@ApiOperation(value="nu_invoicing_cgd_main-通过id删除", notes="nu_invoicing_cgd_main-通过id删除")
+	@AutoLog(value = "采购单-通过id删除")
+	@ApiOperation(value="采购单-通过id删除", notes="采购单-通过id删除")
 	@RequiresPermissions("cgd:nu_invoicing_cgd_main:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -126,8 +126,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "nu_invoicing_cgd_main-批量删除")
-	@ApiOperation(value="nu_invoicing_cgd_main-批量删除", notes="nu_invoicing_cgd_main-批量删除")
+	@AutoLog(value = "采购单-批量删除")
+	@ApiOperation(value="采购单-批量删除", notes="采购单-批量删除")
 	@RequiresPermissions("cgd:nu_invoicing_cgd_main:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -141,8 +141,8 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "nu_invoicing_cgd_main-通过id查询")
-	@ApiOperation(value="nu_invoicing_cgd_main-通过id查询", notes="nu_invoicing_cgd_main-通过id查询")
+	//@AutoLog(value = "采购单-通过id查询")
+	@ApiOperation(value="采购单-通过id查询", notes="采购单-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<NuInvoicingCgdMain> queryById(@RequestParam(name="id",required=true) String id) {
 		NuInvoicingCgdMain nuInvoicingCgdMain = nuInvoicingCgdMainService.getById(id);
@@ -177,4 +177,23 @@ public class NuInvoicingCgdMainController extends JeecgController<NuInvoicingCgd
         return super.importExcel(request, response, NuInvoicingCgdMain.class);
     }
 
+
+	 @AutoLog(value = "采购单-审核")
+	 @ApiOperation(value="采购单-审核", notes="采购单-审核")
+	 @RequiresPermissions("cgd:nu_invoicing_cgd_main:add")
+	 @PostMapping(value = "/auditInfo")
+	 public Result<String> auditInfo(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) {
+		 nuInvoicingCgdMainService.updateById(nuInvoicingCgdMain);
+		 return Result.OK("添加成功！");
+	 }
+
+	 @AutoLog(value = "采购单-入库操作")
+	 @ApiOperation(value="采购单-入库操作", notes="采购单-入库操作")
+	 @RequiresPermissions("cgd:nu_invoicing_cgd_main:add")
+	 @PostMapping(value = "/rukuInfo")
+	 public Result<String> rukuInfo(@RequestBody NuInvoicingCgdMain nuInvoicingCgdMain) {
+		 nuInvoicingCgdMainService.rukuInfo(nuInvoicingCgdMain);
+		 return Result.OK("添加成功！");
+	 }
+
 }

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

@@ -4,10 +4,9 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
 import org.jeecg.common.constant.ProvinceCityArea;
 import org.jeecg.common.util.SpringContextUtils;
 import lombok.Data;
@@ -92,14 +91,17 @@ public class NuInvoicingCgdMain implements Serializable {
 	/**付款方式*/
 	@Excel(name = "付款方式", width = 15)
     @ApiModelProperty(value = "付款方式")
+    @Dict(dicCode = "gys_fkfs")
     private String gysFkfs;
 	/**状态 0:待采购  1：采购中  2采购完成 3作废*/
-	@Excel(name = "状态 0:待采购  1：采购中  2采购完成 3作废", width = 15)
-    @ApiModelProperty(value = "状态 0:待采购  1：采购中  2采购完成 3作废")
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    @Dict(dicCode = "cgd_status")
     private String status;
-	/**采购单类型 0采购单 1挂帐单 2作废*/
-	@Excel(name = "采购单类型 0采购单 1挂帐单 2作废", width = 15)
-    @ApiModelProperty(value = "采购单类型 0采购单 1挂帐单 2作废")
+	/**采购单类型 0采购单 1挂帐单 2结账单 9作废*/
+	@Excel(name = "采购单类型", width = 15)
+    @ApiModelProperty(value = "采购单类型")
+    @Dict(dicCode = "cgd_type")
     private String cgdType;
 	/**随行单*/
 	@Excel(name = "随行单", width = 15)
@@ -127,4 +129,7 @@ public class NuInvoicingCgdMain implements Serializable {
 	@Excel(name = "审核备注", width = 15)
     @ApiModelProperty(value = "审核备注")
     private String content;
+
+    @TableField(exist = false)
+    private List<NuInvoicingCgdInfo> cgdInfoList;
 }

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

@@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface INuInvoicingCgdMainService extends IService<NuInvoicingCgdMain> {
 
+    void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain);
 }

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

@@ -1,12 +1,22 @@
 package com.nu.modules.cgd.service.impl;
 
+import com.nu.modules.cgd.entity.NuInvoicingCgdInfo;
 import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
+import com.nu.modules.cgd.mapper.NuInvoicingCgdInfoMapper;
 import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper;
 import com.nu.modules.cgd.service.INuInvoicingCgdMainService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
 /**
  * @Description: nu_invoicing_cgd_main
  * @Author: jeecg-boot
@@ -16,4 +26,45 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMainMapper, NuInvoicingCgdMain> implements INuInvoicingCgdMainService {
 
+    @Autowired
+    private NuInvoicingCgdInfoMapper cgdInfoMapper;
+
+    @Override
+    public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
+
+        List<NuInvoicingCgdInfo> cgdInfoList = nuInvoicingCgdMain.getCgdInfoList();
+        List<NuInvoicingCgdInfo> cgdGzdInfoList = new ArrayList<>();
+        for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdInfoList) {
+            nuInvoicingCgdInfo.setMainId(nuInvoicingCgdMain.getId());
+            cgdInfoMapper.updateById(nuInvoicingCgdInfo);
+            //判断是否有未入库的数量
+            String wrksl = nuInvoicingCgdInfo.getWrksl();
+            if(StringUtils.isNotBlank(wrksl) && Integer.parseInt(wrksl) > 0){
+                nuInvoicingCgdInfo.setId(null);
+                nuInvoicingCgdInfo.setPurchaseQuantity(Integer.parseInt(wrksl));
+                nuInvoicingCgdInfo.setRksl(null);
+                nuInvoicingCgdInfo.setWrksl(null);
+                cgdGzdInfoList.add(nuInvoicingCgdInfo);
+            }
+        }
+        nuInvoicingCgdMain.setStatus("2");//采购完成
+        baseMapper.updateById(nuInvoicingCgdMain);
+        //判断是否有挂帐单数据,如果有生成挂帐单数据
+        if(cgdGzdInfoList.size() > 0){
+            String cgdNo = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + String.format("%06d", new Random().nextInt(1000000));
+            nuInvoicingCgdMain.setId(null);
+            nuInvoicingCgdMain.setCgdNo(cgdNo);
+            nuInvoicingCgdMain.setStatus("1");//采购中
+            nuInvoicingCgdMain.setCgdType("1");//挂帐单
+            nuInvoicingCgdMain.setSxdPath(null);//清空随行单的单据
+            nuInvoicingCgdMain.setXzdPath(null);//清空销账单的单据
+            nuInvoicingCgdMain.setJzdPath(null);//清空结账单的单据
+            baseMapper.insert(nuInvoicingCgdMain);
+            for (NuInvoicingCgdInfo nuInvoicingCgdInfo : cgdGzdInfoList){
+                nuInvoicingCgdInfo.setCgdId(nuInvoicingCgdMain.getId());
+                nuInvoicingCgdInfo.setCreateTime(new Date());
+                cgdInfoMapper.insert(nuInvoicingCgdInfo);
+            }
+        }
+    }
 }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdInfoServiceImpl.java

@@ -79,6 +79,13 @@ public class QgdInfoServiceImpl extends ServiceImpl<QgdInfoMapper, QgdInfo> impl
                 info.setWlUnits(ConfigMaterialInfo.getMaterialUnits());
                 info.setWlUpperLimit(warehouseMaterialInfo.getUpperLimit());
                 info.setWlLowerLimit(warehouseMaterialInfo.getLowerLimit());
+                if(StringUtils.equals("1",ConfigMaterialInfo.getMultiUnitType())){
+                    info.setReferenceUnitPrice(ConfigMaterialInfo.getOneUnitPrice()+"");
+                }else if(StringUtils.equals("2",ConfigMaterialInfo.getMultiUnitType())){
+                    info.setReferenceUnitPrice(ConfigMaterialInfo.getTwoUnitPrice()+"");
+                } else if(StringUtils.equals("3",ConfigMaterialInfo.getMultiUnitType())){
+                    info.setReferenceUnitPrice(ConfigMaterialInfo.getReferenceUnitPrice()+"");
+                }
                 baseMapper.insert(info);
             }
         }

nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qgd/service/impl/QgdMainServiceImpl.java

@@ -125,7 +125,11 @@ public class QgdMainServiceImpl extends ServiceImpl<QgdMainMapper, QgdMain> impl
         }
         System.out.println(mapList);
 
-
+        //修改请购单状态-变成已经下单
+        QgdMain qgdMain1 = new QgdMain();
+        qgdMain1.setId(qgdMain.getId());
+        qgdMain1.setStatus(1);
+        baseMapper.updateById(qgdMain1);
 
         return "1";
     }