面损表审批流

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -182,6 +182,8 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             return null;
         }
         syCostAllocation = list.get(0);
+        //税率赋值，默认13
+        syCostAllocation.setTaxrate(new BigDecimal(13));
         //制单人 取当前查询人
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         syCostAllocation.setPreparedBy(sysUser.getRealname());
@@ -415,7 +417,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         List<SyCostAllocationCostpay> syCostAllocationCostpays = syCostAllocationCostpayMapper.queryByCostPay(plannum);
         for (int i=0;i<syCostAllocationCostpays.size();i++) {
             SyCostAllocationCostpay syCostAllocationCostpay = syCostAllocationCostpays.get(i);
-            //费用支出单原币本币汇总 并 赋值给表头
+            //费用支出单原币本币汇总 并 赋值给表头（运杂费）
             if(syCostAllocation.getUsdExpense()==null){
                 syCostAllocation.setUsdExpense(syCostAllocationCostpay.getDisbursedOriginalmoney());
             }else {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/controller/SyCostLossReviewController.java

@@ -11,7 +11,9 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview;
 import org.jeecg.modules.documents.costLossReview.entity.FabricLossReview;
+import org.jeecg.modules.documents.costLossReview.entity.SyApprovalHistory;
 import org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview;
+import org.jeecg.modules.documents.costLossReview.mapper.SyCostLossReviewMapper;
 import org.jeecg.modules.documents.costLossReview.service.ISyCostLossReviewService;
 import org.jeecg.modules.documents.orderData.entity.SyOrderData;
 import org.jeecg.modules.documents.orderData.service.ISyOrderDataService;
@@ -43,6 +45,8 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
     private ISyPlanStatisticsService syPlanStatisticsService;
    @Autowired
    private ISyFabricLossReportService syFabricLossReportService;
+   @Autowired
+   private SyCostLossReviewMapper syCostLossReviewMapper;
     @Autowired
     private FabricLossMapper fabricLossMapper;
 
@@ -182,6 +186,16 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
                                         HttpServletRequest req){
        Page<FabricLossReview> page = new Page<FabricLossReview>(pageNo, pageSize);
        IPage<FabricLossReview> pageList = syCostLossReviewService.querySyFabricLossReport(sy,page);
+        for(FabricLossReview li:pageList.getRecords()){
+            //查询指派人
+            String name = syCostLossReviewMapper.querySyApprovalAssignedBy(li.getCCode());
+            if(oConvertUtils.isNotEmpty(name)){
+                li.setApprovalMan(name);
+            }else{
+                li.setApprovalMan("");
+            }
+
+        }
        return Result.OK(pageList);
    }
 
@@ -197,4 +211,93 @@ public class SyCostLossReviewController extends JeecgController<SyOrderData, ISy
         return Result.OK(pageList);
     }
 
+
+    /**
+     * 面损表列表取消提交
+     * @param costAllocationReview
+     * @return
+     */
+    @PostMapping(value = "/cancelSubmission")
+    public Result<String> cancelSubmission(@RequestBody CostAllocationReview costAllocationReview){
+
+        Result<String> result = new Result<String>();
+
+        if(oConvertUtils.isEmpty(costAllocationReview.getPlanNum())){
+            result.setSuccess(false);
+            result.setMessage("取消提交失败，未获取到计划号！");
+            result.setResult("取消提交失败，未获取到计划号！");
+            return result;
+        }
+
+           int i =  syCostLossReviewService.cancelSubmission(costAllocationReview.getPlanNum(),costAllocationReview.getStatus(),costAllocationReview.getCurrentState(),costAllocationReview.getSyApprovalHistory());
+
+           if(i>0){
+               result.setSuccess(true);
+               result.setMessage(costAllocationReview.getCurrentState()+"成功！");
+               result.setResult(costAllocationReview.getPlanNum());
+           }
+
+
+
+        return result;
+
+    }
+
+
+    /**
+     * 审批历史查询
+     * @param code
+     * @return
+     */
+    @GetMapping(value = "/querySyApprovalHistory")
+    public Result<List<SyApprovalHistory>> querySyApprovalHistory(String code){
+
+        Result<List<SyApprovalHistory>> result = new Result<List<SyApprovalHistory>>();
+
+        if(oConvertUtils.isEmpty(code)){
+            result.setSuccess(false);
+            result.setMessage("计划号不能为空！");
+            return result;
+        }
+       List<SyApprovalHistory> list = syCostLossReviewMapper.querySyApprovalHistory(code);
+
+        result.setMessage("查询成功！");
+        result.setSuccess(true);
+        result.setResult(list);
+
+        return result;
+
+    }
+
+
+    /**
+     * 查询是否有指派人
+     * @param code
+     * @return
+     */
+    @GetMapping(value = "/querySyApprovalAssignedBy")
+    public Result<String> querySyApprovalAssignedBy(String code){
+
+        Result<String> result = new Result<String>();
+
+        if(oConvertUtils.isEmpty(code)){
+            result.setSuccess(false);
+            result.setMessage("计划号不能为空！");
+            return result;
+        }
+        String name = syCostLossReviewMapper.querySyApprovalAssignedBy(code);
+        if(oConvertUtils.isNotEmpty(name)){
+            result.setMessage("查询成功！");
+            result.setSuccess(true);
+            result.setResult(name);
+        }else{
+            result.setMessage("查询成功！");
+            result.setSuccess(true);
+            result.setResult("");
+        }
+
+        return result;
+
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/CostAllocationReview.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.documents.costLossReview.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,4 +65,11 @@ public class CostAllocationReview {
     @ApiModelProperty(value = "制单人")
     private String preparedBy;
 
+
+    //审批历史对象
+    @TableField(exist = false)
+    private SyApprovalHistory syApprovalHistory;
+    //当前状态
+    @TableField(exist = false)
+    private String currentState;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/SyApprovalHistory.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.documents.costLossReview.entity;
+
+
+import lombok.Data;
+
+/**
+ * 面损列表审批历史
+ */
+@Data
+public class SyApprovalHistory {
+
+
+    //ID
+    private String id;
+    //状态
+    private String stuta;
+    //计划号
+    private String planNo;
+    //处理人
+    private String processedBy;
+    //处理时间
+    private String processingTime;
+    //处理意见
+    private String processingOpinion;
+    //指派人
+    private String assignedBy;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/entity/SyCostLossReview.java

@@ -53,7 +53,8 @@ public class SyCostLossReview {
 
 	private String ffirstApproveDate;
 
-
+    //面损表审批状态
+	private String stuta;
 	//查询条件审核结束日期
 	private String ffirstApproveDateB;
 	private String ffirstApproveDateE;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/SyCostLossReviewMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview;
 import org.jeecg.modules.documents.costLossReview.entity.FabricLossReview;
+import org.jeecg.modules.documents.costLossReview.entity.SyApprovalHistory;
 import org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
@@ -35,4 +36,53 @@ public interface SyCostLossReviewMapper extends BaseMapper<SyCostLossReview> {
     List<String> queryCodeByfstatus(@Param("status")String status,@Param("ffirstApproveDateB")String ffirstApproveDateB,@Param("ffirstApproveDateE")String ffirstApproveDateE);
     List<String> queryCodeBycstatus(@Param("status")String status);
     List<String> queryCodeByPlanTable(@Param("remarks")String remarks,@Param("planMan")String planMan);
+
+
+    //面损表列表修改审批状态
+    public int cancelSubmission(@Param("code") String code,@Param("stuta") String stuta,@Param("currentState") String currentState);
+
+    /**
+     * 面损表列表修改第一次驳回日期
+     * @param code 计划号
+     * @param stuta 原本状态
+     * @param rejectionDate 驳回日期
+     * @return
+     */
+    public int rejectionDateUpdate(@Param("code") String code,@Param("stuta") String stuta,@Param("rejectionDate") String rejectionDate,@Param("rejectBy") String rejectBy);
+
+    /**
+     * 面损表列表修改第一次提交日期
+     * @param code 计划号
+     * @param stuta 原本状态
+     * @param submitDate 提交日期
+     * @return
+     */
+    public int submitDateUpdate(@Param("code") String code,@Param("stuta") String stuta,@Param("submitDate") String submitDate,@Param("submitBy") String submitBy);
+
+    /**
+     * 面损表列表修改第一次审批日期
+     * @param code 计划号
+     * @param stuta 原本状态
+     * @param firstApproveDate 审批日期
+     * @return
+     */
+    public int firstApproveDateUpdate(@Param("code") String code,@Param("stuta") String stuta,@Param("firstApproveDate") String firstApproveDate,@Param("firstApproveBy") String firstApproveBy);
+
+
+    //通过计划号查询审批历史
+    List<SyApprovalHistory> querySyApprovalHistory(@Param("code") String code);
+
+    /**
+     * 面损表新增审批历史
+     * @param syApprovalHistory
+     * @return
+     */
+    public int addSyApprovalHistory(@Param("syApprovalHistory") SyApprovalHistory syApprovalHistory);
+
+
+    /**
+     * 查询指派人
+     * @return
+     */
+    String querySyApprovalAssignedBy(@Param("code") String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -163,6 +163,9 @@
         <if test="sy.makingPeople != null and sy.makingPeople !=''">
             AND JSON_EXTRACT( content, '$.makingPeople' ) LIKE CONCAT('%',#{sy.makingPeople},'%')
         </if>
+        <if test="sy.status != null and sy.status !=''">
+            AND status = #{sy.status}
+        </if>
     </select>
 
     <select id="queryCostAllocation" resultType="org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview">
@@ -251,7 +254,7 @@
         submit_date as csubmitDate,reject_date as frejectDate,first_approve_date as ffirstApproveDate,
         final_approve_date as cfinalApproveDate,status as cstatus
         from sy_cost_json
-        where plan_num=#{planCode}
+        where plan_num=#{planCode} and 1=1
     </select>
 
 
@@ -335,5 +338,57 @@
         </if>
 
 
+    </select>
+
+<!--    面损表列表取消提交-->
+    <update id="cancelSubmission">
+
+        update sy_fabric_loss_report
+        set status = #{stuta}
+        where plan_code = #{code}
+    </update>
+
+    <!--    面损表列表修改第一次驳回日期-->
+    <update id="rejectionDateUpdate">
+
+        update sy_fabric_loss_report
+        set status = #{stuta},reject_date = #{rejectionDate},reject_by = #{rejectBy}
+        where plan_code = #{code}
+    </update>
+
+    <!--    面损表列表修改第一次审批日期-->
+    <update id="firstApproveDateUpdate">
+
+        update sy_fabric_loss_report
+        set status = #{stuta},first_approve_date = #{firstApproveDate}, first_approve_by= #{firstApproveBy}
+        where plan_code = #{code}
+    </update>
+
+    <!--    面损表列表修改第一次提交日期-->
+    <update id="submitDateUpdate">
+
+        update sy_fabric_loss_report
+        set status = #{stuta},submit_date = #{submitDate}, submit_by= #{submitBy}
+        where plan_code = #{code}
+    </update>
+
+    <select id="querySyApprovalHistory" resultType="org.jeecg.modules.documents.costLossReview.entity.SyApprovalHistory">
+
+     select id,case when stuta = '指派' then concat(stuta,'（',assigned_by,'）') else stuta end as stuta,plan_no as planNo,processed_by as processedBy,processing_time as processingTime,
+     processing_opinion as processingOpinion from sy_approval_history
+     where plan_no = #{code} order by processing_time
+
+    </select>
+
+    <insert id="addSyApprovalHistory">
+    insert into sy_approval_history(id,stuta,plan_no,processed_by,processing_time,processing_opinion,assigned_by)
+    values(#{syApprovalHistory.id},#{syApprovalHistory.stuta},#{syApprovalHistory.planNo},#{syApprovalHistory.processedBy},#{syApprovalHistory.processingTime},
+    #{syApprovalHistory.processingOpinion},#{syApprovalHistory.assignedBy})
+    </insert>
+
+    <select id="querySyApprovalAssignedBy" resultType="String">
+        select assigned_by as assignedBy from sy_approval_history
+        where plan_no = #{code} and stuta = '指派'
+
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/ISyCostLossReviewService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview;
 import org.jeecg.modules.documents.costLossReview.entity.FabricLossReview;
+import org.jeecg.modules.documents.costLossReview.entity.SyApprovalHistory;
 import org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview;
 
 import java.util.List;
@@ -26,4 +27,24 @@ public interface ISyCostLossReviewService extends IService<SyCostLossReview> {
      List<String> queryCodeByfstatus(String status,String ffirstApproveDateB,String ffirstApproveDateE);
      List<String> queryCodeBycstatus(String status);
      List<String> queryCodeByPlanTable(String remarks,String planMan);
+
+
+
+
+     /**
+      * 面损表列表修改审批状态
+      * @param code 计划号
+      * @param stuta 原本状态
+      * @param currentState 当前按钮状态
+      * @return
+      */
+     public int cancelSubmission(String code,String stuta,String currentState,SyApprovalHistory syApprovalHistory);
+
+     /**
+      * 面损表新增审批历史
+      * @param syApprovalHistory
+      * @return
+      */
+     public int addSyApprovalHistory(SyApprovalHistory syApprovalHistory);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/service/impl/SyCostLossReviewServiceImpl.java

@@ -1,16 +1,23 @@
 package org.jeecg.modules.documents.costLossReview.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.documents.costLossReview.entity.CostAllocationReview;
 import org.jeecg.modules.documents.costLossReview.entity.FabricLossReview;
+import org.jeecg.modules.documents.costLossReview.entity.SyApprovalHistory;
 import org.jeecg.modules.documents.costLossReview.entity.SyCostLossReview;
 import org.jeecg.modules.documents.costLossReview.mapper.SyCostLossReviewMapper;
 import org.jeecg.modules.documents.costLossReview.service.ISyCostLossReviewService;
+import org.jeecg.modules.report.entity.SyFabricLossReport;
+import org.jeecg.modules.report.service.impl.SyFabricLossReportServiceImpl;
+import org.jeecg.modules.system.util.oConvertUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,11 +27,14 @@ import java.util.List;
  * @Date:   2023-03-06
  * @Version: V1.0
  */
+@Transactional
 @Service
 public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMapper, SyCostLossReview> implements ISyCostLossReviewService {
 
     @Autowired
     private SyCostLossReviewMapper syCostLossReviewMapper;
+    @Autowired
+    private SyFabricLossReportServiceImpl syFabricLossReportService;
 
     @Override
     public IPage<SyCostLossReview> querylist(SyCostLossReview syCostLossReview,List<String> list, Page<SyCostLossReview> page) {
@@ -75,4 +85,102 @@ public class SyCostLossReviewServiceImpl extends ServiceImpl<SyCostLossReviewMap
     public List<String> queryCodeByPlanTable(String remarks, String planMan) {
         return syCostLossReviewMapper.queryCodeByPlanTable(remarks, planMan);
     }
+
+
+    /**
+     * 面损表列表修改审批状态
+     * @param code
+     * @return
+     */
+    @Override
+    public int cancelSubmission(String code,String stuta,String currentState,SyApprovalHistory syApprovalHistory) {
+        int i = 0;
+        //判断状态是否为提交状态状态，如果是才可以取消提交
+        if(currentState.equals("取消提交")){
+            if(stuta.equals("提交")){
+                i = syCostLossReviewMapper.cancelSubmission(code,"保存","");
+                this.addSyApprovalHistory(syApprovalHistory);
+            }else{
+                throw new JeecgBootException("取消提交失败，只允许'提交'状态下才能取消提交！");
+            }
+        }
+        if(currentState.equals("提交")){
+            //查询面损表是否含有第一次提交日期
+            QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("plan_code",code);
+            List<SyFabricLossReport> list = syFabricLossReportService.list(queryWrapper);
+            if(oConvertUtils.isEmpty(list.get(0).getSubmitDate())){
+                i = syCostLossReviewMapper.submitDateUpdate(code,"提交",syApprovalHistory.getProcessingTime(),syApprovalHistory.getProcessedBy());
+                this.addSyApprovalHistory(syApprovalHistory);
+            }else {
+                i = syCostLossReviewMapper.cancelSubmission(code, "提交", "");
+                this.addSyApprovalHistory(syApprovalHistory);
+            }
+
+            //查询审批历史是否有指派，如果有提交状态改成已指派
+            String name = syCostLossReviewMapper.querySyApprovalAssignedBy(code);
+            if(oConvertUtils.isNotEmpty(name)){
+                i = syCostLossReviewMapper.cancelSubmission(code, "已指派", "");
+            }
+        }
+        if(currentState.equals("指派")){
+            i = syCostLossReviewMapper.cancelSubmission(code,"已指派","");
+            this.addSyApprovalHistory(syApprovalHistory);
+        }
+        if(currentState.equals("审批通过")){
+            //查询面损表是否含有第一次审批日期
+            QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("plan_code",code);
+            List<SyFabricLossReport> list = syFabricLossReportService.list(queryWrapper);
+            if(oConvertUtils.isEmpty(list.get(0).getFirstApproveDate())){
+                i = syCostLossReviewMapper.firstApproveDateUpdate(code,"完成",syApprovalHistory.getProcessingTime(),syApprovalHistory.getProcessedBy());
+                this.addSyApprovalHistory(syApprovalHistory);
+            }else {
+                i = syCostLossReviewMapper.cancelSubmission(code, "完成", "");
+                this.addSyApprovalHistory(syApprovalHistory);
+            }
+        }
+        if(currentState.equals("驳回")){
+            //查询面损表是否含有第一次驳回日期
+            QueryWrapper<SyFabricLossReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("plan_code",code);
+            List<SyFabricLossReport> list = syFabricLossReportService.list(queryWrapper);
+            if(oConvertUtils.isEmpty(list.get(0).getRejectDate())){
+                i = syCostLossReviewMapper.rejectionDateUpdate(code,"返单",syApprovalHistory.getProcessingTime(),syApprovalHistory.getProcessedBy());
+                this.addSyApprovalHistory(syApprovalHistory);
+            }else {
+                i = syCostLossReviewMapper.cancelSubmission(code, "返单", "");
+                this.addSyApprovalHistory(syApprovalHistory);
+            }
+        }
+        if(currentState.equals("撤销审批")){
+            i = syCostLossReviewMapper.cancelSubmission(code,"保存","");
+            this.addSyApprovalHistory(syApprovalHistory);
+        }
+
+       if(i>0){
+           return 1;
+       }
+        return 0;
+    }
+
+
+    /**
+     * 新增审批历史
+     * @param syApprovalHistory
+     * @return
+     */
+    @Override
+    public int addSyApprovalHistory(SyApprovalHistory syApprovalHistory) {
+
+        //设置ID
+        syApprovalHistory.setId(oConvertUtils.id());
+
+        int i = syCostLossReviewMapper.addSyApprovalHistory(syApprovalHistory);
+
+        if(i>0){
+            return i;
+        }
+        return 0;
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1253,6 +1253,10 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 }
 					 //集合转map
 					 for (SyShippingOrderItem li : list) {
+					 	if(oConvertUtils.isNotEmpty(li.getHod())) {
+							String hod[] = li.getHod().split(" ");
+							li.setHod(hod[0]);
+						}
 						 Field[] fieldsList = li.getClass().getDeclaredFields();
 						 Map<String, Object> mapList = new HashMap<String, Object>();
 						 for (Field field : fieldsList) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -115,7 +115,7 @@ a.salesman, a.operating_department as operatingDepartment, a.purchase_outsourcin
             left join sy_packing_list_tailoring_item c
             on a.tailoring_fabric_item_id = c.id
             where a.del_flag = 0 and sy_shipping_order_item_id = #{id}
-            group by c.group_id order by style_number,smail_po desc
+            group by c.group_id order by a.supplier,a.style_number,a.smail_po,a.english_name,a.unit_price
         </if>
         <if test='type == "面辅料"'>
             left join sy_packing_list_fabric_item c
@@ -290,7 +290,7 @@ on a.tailoring_fabric_item_id = c.id
         left join sy_declaration_elements b
         on a.elements_Id = b.id
         where sy_shipping_order_item_id = #{id}
-        group by a.style_number
+        group by a.style_number,a.english_name
     </select>
 
     <select id="queryU8Rate"  parameterType="java.lang.String" resultType="java.util.HashMap">