Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/controller/CwReimbursementTypeController.java

@@ -132,6 +132,18 @@ public class CwReimbursementTypeController {
      * @return
      */
     @ApiOperation(value = "查询树形")
+    @GetMapping("/summaryTreeData")
+    public ResponseEntity<List<CwReimbursementTypeInfo>> summaryTreeData(@RequestParam(required = false) String extId, @RequestParam(required = false) String type) throws Exception{
+        List<CwReimbursementTypeInfo> infos = treeService.summaryTreeData(extId, type);
+        return ResponseEntity.ok(infos);
+    }
+
+    /**
+     * 查询树形
+     * @param extId 排除的ID
+     * @return
+     */
+    @ApiOperation(value = "查询树形")
     @GetMapping("/treeData2")
     public ResponseEntity<List<CwReimbursementTypeInfo>> treeData2(@RequestParam(required = false) String extId, @RequestParam(required = false) String type) throws Exception{
         List<CwReimbursementTypeInfo> infos = treeService.treeDataForType2(extId, type);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reimbursementApproval/approvalType/service/CwReimbursementTypeForTreeDataService.java

@@ -66,6 +66,22 @@ public class CwReimbursementTypeForTreeDataService extends TreeService<CwReimbur
      * @param type 禁选类型
      * @return
      */
+    public List<CwReimbursementTypeInfo> summaryTreeData(String extId, String type) throws Exception{
+        //获取所有的业务类型为1的数据
+        List<CwReimbursementTypeInfo> allList = typeMapper.getAllList("2");
+        CwReimbursementTypeInfo root = entityClass.getConstructor ( ).newInstance ( );
+        root.setId ( TreeDTO.getRootId () );
+        List <CwReimbursementTypeInfo> rootTree = this.formatListToTreeForType ( root, allList, extId, type );
+        return rootTree;
+    }
+
+    /**
+     * 获取JSON树形数据。
+     *
+     * @param extId 排除的ID
+     * @param type 禁选类型
+     * @return
+     */
     public List<CwReimbursementTypeInfo> treeDataForType2(String extId, String type) throws Exception{
         //获取所有的业务类型为1的数据
         List<CwReimbursementTypeInfo> allList = typeMapper.getAllList("2");

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/controller/WareHouseController.java

@@ -2,6 +2,8 @@ package com.jeeplus.test.materialManagement.wareHouse.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeeplus.aop.logging.annotation.ApiLog;
+import com.jeeplus.common.utils.ResponseUtil;
 import com.jeeplus.test.materialManagement.purchase.service.MaterialService;
 import com.jeeplus.test.materialManagement.purchase.service.dto.MaterialInfoDto;
 import com.jeeplus.test.materialManagement.wareHouse.service.WareHouseBasicService;
@@ -29,6 +31,18 @@ public class WareHouseController {
     private WareHouseBasicService basicService;
 
     /**
+     * 根据id修改状态值status
+     * @param dto
+     * @return
+     */
+    @ApiOperation(value = "根据id修改状态值status")
+    @PostMapping(value = "/updateStatusById")
+    public ResponseEntity<String> updateStatusById(@RequestBody WareHouseDto dto) {
+        String s = basicService.updateStatusById(dto);
+        return ResponseEntity.ok(s);
+    }
+
+    /**
      * 删除
      * @param id
      * @return
@@ -83,9 +97,9 @@ public class WareHouseController {
      */
     @ApiOperation(value = "新增、修改")
     @PostMapping("/save")
-    public ResponseEntity<String> save(@RequestBody WareHouseDto dto) throws Exception{
-        basicService.save(dto);
-        return ResponseEntity.ok ("操作成功");
+    public ResponseEntity save(@RequestBody WareHouseDto dto) throws Exception{
+        String id = basicService.save(dto);
+        return ResponseUtil.newInstance().add("businessTable", "material_management_warehouse_basics").add("businessId", id).ok ("操作成功");
     }
 
     /**
@@ -99,4 +113,16 @@ public class WareHouseController {
         WareHouseDto dto = basicService.findById(id);
         return ResponseEntity.ok(dto);
     }
+
+    /**
+     * 查询采购明细表id
+     * @param purchaseNo
+     * @return
+     */
+    @ApiOperation(value = "查询采购明细表id")
+    @GetMapping("/findRequestId")
+    public ResponseEntity<String> findRequestId(@RequestParam String purchaseNo) throws Exception{
+        String id = basicService.findRequestId(purchaseNo);
+        return ResponseEntity.ok(id);
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseBasic.java

@@ -21,6 +21,12 @@ public class WareHouseBasic extends BaseEntity {
     //入库编号（字典值）
     public static final String BIZ_CODE = "28";
 
+    private String procInsId;
+
+    private String processDefinitionId;
+
+    private String status;
+
     /**
      * 备注
      */

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseDetailed.java

@@ -75,6 +75,11 @@ public class WareHouseDetailed extends BaseEntity {
      */
     private String tradeTotalPrice;
 
+    /**
+     * 实际价格
+     */
+    private String actualPrice;
+
     //附件信息
     @TableField(exist = false)
     List<WorkAttachmentDto> fileInfoLost;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/WareHouseBasicMapper.java

@@ -20,4 +20,6 @@ public interface WareHouseBasicMapper extends BaseMapper<WareHouseBasic> {
     String getUserNameByUserId(String id);
 
     IPage<WareHouseDto> summaryList(Page<WareHouseDto> page,@Param(Constants.WRAPPER) QueryWrapper<WareHouseDto> queryWrapper);
+
+    String findRequestId(String purchaseNo);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -12,7 +12,10 @@
 			a.handled_by,
 			a.handled_by_office,
 			so.name as handledByOfficeName,
-			sy.name as handleByName
+			sy.name as handleByName,
+			a.proc_ins_id,
+			a.process_definition_id,
+			ifnull(a.status,'0') as status
 		FROM
 			material_management_warehouse_basics a
 			left join sys_office so on a.handled_by_office = so.id
@@ -48,4 +51,7 @@
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
 	</select>
+    <select id="findRequestId" resultType="java.lang.String">
+		select id from material_management_pruchase_request_basics where purchase_no = #{purchaseNo} and del_flag = 0
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -25,10 +25,12 @@ import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.domain.WorkAttachment;
 import com.jeeplus.test.oss.mapper.OssServiceMapper;
 import com.jeeplus.test.workContract.service.dto.WorkAttachmentDto;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
@@ -115,8 +117,14 @@ public class WareHouseBasicService {
             });
         }
         //将采购详情数据查出
-        MaterialBasic basic = materialBasicMapper.getInfoByPurchaseNo(info.getPurchaseNo());
-        List<MaterialDetailed> detailedList = materialDetailedMapper.getByBasicId(basic.getId());
+        List<MaterialDetailed> detailedList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(info.getPurchaseNo())) {
+            MaterialBasic basic = materialBasicMapper.getInfoByPurchaseNo(info.getPurchaseNo());
+            if (null != basic) {
+                detailedList = materialDetailedMapper.getByBasicId(basic.getId());
+            }
+        }
+
         if (CollectionUtils.isNotEmpty(detailedList)){
             detailedList.forEach(detailed->{
                 //附件信息
@@ -389,6 +397,9 @@ public class WareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getHandledByOffice())) {
             queryWrapper.like("a.handled_by_office", dto.getHandledByOffice());
         }
+        if (StringUtils.isNotEmpty(dto.getStatus())) {
+            queryWrapper.like("a.status", dto.getStatus());
+        }
         // 入库时间
         String[] contractDates = dto.getWareHouseDates();
         if (contractDates != null) {
@@ -420,6 +431,12 @@ public class WareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getWareHouseManOffice())) {
             queryWrapper.like("so.id", dto.getWareHouseManOffice());
         }
+
+        //入库类型
+        if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
+            queryWrapper.eq("d.name", dto.getWareHouseType());
+        }
+
         // 入库时间
         String[] contractDates = dto.getWareHouseDates();
         if (contractDates != null) {
@@ -429,4 +446,16 @@ public class WareHouseBasicService {
 
         return basicMapper.summaryList(page, queryWrapper);
     }
+
+    public String findRequestId(String purchaseNo) {
+        return basicMapper.findRequestId(purchaseNo);
+    }
+
+    public String updateStatusById(WareHouseDto dto) {
+        WareHouseBasic wareHouseBasic = new WareHouseBasic();
+        BeanUtils.copyProperties(dto,wareHouseBasic);
+        basicMapper.update(wareHouseBasic, new QueryWrapper<WareHouseBasic>().lambda().eq(WareHouseBasic::getId, wareHouseBasic.getId()));
+        return "操作成功";
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/dto/WareHouseDto.java

@@ -20,6 +20,12 @@ public class WareHouseDto {
     //入库编号（字典值）
     public static final String BIZ_CODE = "28";
 
+    private String procInsId;
+
+    private String processDefinitionId;
+
+    private String status;
+
     /**
      * 创建人
      */
@@ -77,6 +83,16 @@ public class WareHouseDto {
     private String wareHouseTotalPrice;
 
     /**
+     * 入库商品实际价格
+     */
+    private String wareHouseActualPrice;
+
+    /**
+     * 实际价格
+     */
+    private String actualPrice;
+
+    /**
      * 入库编号
      */
     private String wareHouseNumber;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/domain/ProofreadDetail.java

@@ -36,6 +36,11 @@ public class ProofreadDetail extends BaseEntity {
     private String reviewComments;
 
     /**
+     * 是否适用
+     */
+    private String isApply;
+
+    /**
      * 回复意见
      */
     private String replyComments;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/xml/ProofreadDetailMapper.xml

@@ -15,6 +15,7 @@
 			b.`name` AS type_name,
 			ifnull(a.review_comments,"") as "reviewComments",
 			ifnull(a.reply_comments,"") as "replyComments",
+			ifnull(a.is_apply,"") as "isApply",
 			b.sort
 		FROM proofread_type b
 		LEFT JOIN proofread_detail a ON a.type_id = b.id