[fix]

品质管理 品质单
新增根据入库单号和物料号查询品质单详情mapper方法；

ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityOrderDetailMapper.java

@@ -108,4 +108,8 @@ public interface QualityOrderDetailMapper
      * 查询委内加工品质单开始品质  物料相关信息
      */
     List<QualityOrderDetail> selectMakeInOrderDetailListByCode(String qualityOrderCode);
+
+
+//    根据入库单号和物料号查询品质单详情
+    QualityOrderDetail selectQualityOrderDetailByStorageCodeAndno(QualityOrderDetail qualityOrderDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceOrderController.java

@@ -315,4 +315,15 @@ public class OutsourceOrderController extends BaseController
         outsourceOrderService.restoreOutsourceOrderById(id);
         return AjaxResult.success();
     }
+
+    /**
+     * 结案
+     */
+    @GetMapping("/closed/{outsourceOrderNo}")
+    public String closed(@PathVariable("outsourceOrderNo") String outsourceOrderNo, ModelMap mmap)
+    {
+        List<OutsourceOrderVO> outsourceOrderVO = outsourceOrderService.selectOutsourceOrderByOutsourceOrderNo(outsourceOrderNo);
+        mmap.put("outsourceOrder", outsourceOrderVO.get(0));
+        return prefix + "/closed";
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourcePlanController.java

@@ -122,7 +122,7 @@ public class OutsourcePlanController extends BaseController
         return prefix + "/edit";
     }
     /**
-     * 修改委外计划
+     * 委外计划详情
      */
     @RequiresPermissions("system:outsource_plan:detail")
     @GetMapping("/detail/{outsourcePlanId}")

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceQuoteController.java

@@ -9,10 +9,13 @@ import com.ruoyi.process.general.service.IProcessService;
 import com.ruoyi.system.domain.OutsourceQuote;
 import com.ruoyi.system.domain.OutsourceQuoteChild;
 import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
+import com.ruoyi.system.mapper.OutsourceQuoteMapper;
 import com.ruoyi.system.service.IOutsourceProcessService;
 import com.ruoyi.system.service.IOutsourceQuoteService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.impl.OutsourceQuoteServiceImpl;
+import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamage;
+import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
@@ -22,6 +25,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -63,6 +67,9 @@ public class OutsourceQuoteController extends BaseController
     @Autowired
     private IProcessService processService;
 
+    @Autowired
+    private OutsourceQuoteMapper outsourceQuoteMapper;
+
     @RequiresPermissions("system:outsource_quote:view")
     @GetMapping()
     public String outsource_quote()
@@ -90,11 +97,18 @@ public class OutsourceQuoteController extends BaseController
     @Log(title = "委外报价", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(OutsourceQuoteVO outsourceQuoteVO)
+    public AjaxResult export(OutsourceQuoteVO outsourceQuoteVO, String ids) {
-    {
+
-        List<OutsourceQuoteVO> list = outsourceQuoteService.getExportList(outsourceQuoteVO);
+        if (StringUtils.isEmpty(ids)){
-        ExcelUtil<OutsourceQuoteVO> util = new ExcelUtil<OutsourceQuoteVO>(OutsourceQuoteVO.class);
+            List<OutsourceQuoteChild> quoteChildren = outsourceQuoteMapper.selectOutsourceQuoteChildList();
-        return util.exportExcel(list, "委外报价数据");
+            ExcelUtil<OutsourceQuoteChild> util = new ExcelUtil<OutsourceQuoteChild>(OutsourceQuoteChild.class);
+            return util.exportExcel(quoteChildren, "委外报价数据");
+        }else {
+            String[] quoteCodes = ids.split(",");
+            List<OutsourceQuoteChild> quoteChildren = outsourceQuoteMapper.selectOutsourceQuoteChildByCodes(quoteCodes);
+            ExcelUtil<OutsourceQuoteChild> util = new ExcelUtil<OutsourceQuoteChild>(OutsourceQuoteChild.class);
+            return util.exportExcel(quoteChildren, ids);
+        }
     }
     /**
      * 表格细节视图
@@ -216,7 +230,7 @@ public class OutsourceQuoteController extends BaseController
 //                erpBomVo.setUseStatus("1");
             }
         }
-        outsourceQuoteService.updateOutsourceQuote(outsourceQuoteVO);
+        outsourceQuoteService.updateAuditOutsourceQuote(outsourceQuoteVO);
         // 驳回申请后继续申请，可能修改表单
         if (saveEntityBoolean) {
             outsourceQuoteService.updateOutsourceQuote(outsourceQuoteVO);

ruoyi-admin/src/main/java/com/ruoyi/system/controller/OutsourceRequisitionController.java

@@ -6,10 +6,13 @@ import java.util.List;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.process.general.service.IProcessService;
 import com.ruoyi.system.domain.OutsourceOrder;
+import com.ruoyi.system.domain.OutsourceQuoteChild;
 import com.ruoyi.system.domain.OutsourceRequisition;
+import com.ruoyi.system.domain.OutsourceRequisitionDetail;
 import com.ruoyi.system.domain.Vo.OutsourceOrderVO;
 import com.ruoyi.system.domain.Vo.OutsourceQuoteVO;
 import com.ruoyi.system.domain.Vo.OutsourceRequisitionVO;
+import com.ruoyi.system.mapper.OutsourceRequisitionMapper;
 import com.ruoyi.system.service.IOutsourceOrderService;
 import com.ruoyi.system.service.IOutsourceRequisitionService;
 import com.ruoyi.system.service.ISysUserService;
@@ -23,6 +26,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -66,6 +70,9 @@ public class OutsourceRequisitionController extends BaseController
     @Autowired
     private IProcessService processService;
 
+    @Autowired
+    private OutsourceRequisitionMapper outsourceRequisitionMapper;
+
     @RequiresPermissions("system:outsource_requisition:view")
     @GetMapping()
     public String outsource_requisition()
@@ -93,11 +100,19 @@ public class OutsourceRequisitionController extends BaseController
     @Log(title = "委外领料", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(OutsourceRequisitionVO outsourceRequisitionVO)
+    public AjaxResult export(OutsourceRequisitionVO outsourceRequisitionVO, String ids) {
-    {
+
-        List<OutsourceRequisitionVO> list = outsourceRequisitionService.selectOutsourceRequisitionList(outsourceRequisitionVO);
+        if (StringUtils.isEmpty(ids)){
-        ExcelUtil<OutsourceRequisitionVO> util = new ExcelUtil<OutsourceRequisitionVO>(OutsourceRequisitionVO.class);
+            OutsourceRequisitionDetail detail = new OutsourceRequisitionDetail();
-        return util.exportExcel(list, "委外领料数据");
+            List<OutsourceRequisitionDetail> requisitionDetails = outsourceRequisitionMapper.selectRequisitionDetailByNo(detail);
+            ExcelUtil<OutsourceRequisitionDetail> util = new ExcelUtil<OutsourceRequisitionDetail>(OutsourceRequisitionDetail.class);
+            return util.exportExcel(requisitionDetails, "委外领料数据");
+        }else {
+            String[] requisitionCodes = ids.split(",");
+            List<OutsourceRequisitionDetail> requisitionDetails = outsourceRequisitionMapper.selectOutsourceRequisitionDetailByCodes(requisitionCodes);
+            ExcelUtil<OutsourceRequisitionDetail> util = new ExcelUtil<OutsourceRequisitionDetail>(OutsourceRequisitionDetail.class);
+            return util.exportExcel(requisitionDetails, ids);
+        }
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceOrder.java

@@ -111,6 +111,10 @@ public class OutsourceOrder extends BaseEntity
     @Excel(name = "详细地址")
     private String receiveAddress;
 
+    private String supplierCode;
+
+    private String supplierName;
+
     /** 流程实例ID */
     private String instanceId;
 
@@ -474,6 +478,22 @@ public class OutsourceOrder extends BaseEntity
         this.cancelRemark = cancelRemark;
     }
 
+    public String getSupplierCode() {
+        return supplierCode;
+    }
+
+    public void setSupplierCode(String supplierCode) {
+        this.supplierCode = supplierCode;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceQuoteChild.java

@@ -20,47 +20,47 @@ public class OutsourceQuoteChild extends BaseEntity
     private Long outsourceQuoteChildId;
 
     /** 关联报价编号字段 */
-    @Excel(name = "关联报价编号字段")
+    @Excel(name = "委外报价单号", sort = 1)
     private String outsourceQuoteCode;
 
     /** 委外工序ID */
-    @Excel(name = "委外工序ID")
+    @Excel(name = "委外工序ID",sort = 4)
     private String outsourceProcessCode;
 
     /** 委外工序编号 */
-    @Excel(name = "委外工序编号")
+    @Excel(name = "委外工序编号",sort = 5)
     private String outsourceProcessNo;
 
     /** 委外工序名称 */
-    @Excel(name = "委外工序名称")
+    @Excel(name = "委外工序名称",sort = 6)
     private String outsourceProcessName;
 
     /** 税率 */
-    @Excel(name = "税率")
+    @Excel(name = "税率",sort = 7)
     private BigDecimal taxRate;
 
     /** 工序的不含税单价(RMB)  */
-    @Excel(name = "工序的不含税单价(RMB) ")
+    @Excel(name = "工序的含税单价(RMB) ",sort = 10)
     private BigDecimal materialRmb;
 
     /** 工序的含税单价(RMB) */
-    @Excel(name = "工序的含税单价(RMB)")
+    @Excel(name = "工序的不含税单价(RMB)",sort = 9)
     private BigDecimal materialNormb;
 
     /** 供应商编号 */
-    @Excel(name = "供应商编号")
+    @Excel(name = "供应商编号",sort = 2)
     private String supplierCode;
 
     /** 供应商名称 */
-    @Excel(name = "供应商名称")
+    @Excel(name = "供应商名称",sort = 3)
     private String supplierName;
 
     /** 审核状态 */
-    @Excel(name = "审核状态")
+    @Excel(name = "审核状态",sort = 11,dictType = "auditStatus")
     private String auditStatus;
 
     /** 计价单位 */
-    @Excel(name = "计价单位")
+    @Excel(name = "计价单位",sort = 8,dictType = "outsource_quote_unit")
     private String chargeUnit;
 
     public String getChargeUnit() {

ruoyi-admin/src/main/java/com/ruoyi/system/domain/OutsourceRequisitionDetail.java

@@ -21,42 +21,51 @@ public class OutsourceRequisitionDetail extends BaseEntity
     private Long outsourceRequisitionDetailId;
 
     /** 委外领料编号 */
-    @Excel(name = "委外领料编号")
+    @Excel(name = "委外领料编号",sort = 1)
     private String outsourceRequisitionNo;
 
     /** 委外订单编号 */
-    @Excel(name = "委外订单编号")
+    @Excel(name = "委外订单编号",sort = 2)
     private String outsourceOrderNo;
 
     /** 料号 */
-    @Excel(name = "料号")
+    @Excel(name = "料号",sort = 3)
     private String materialNo;
 
     /** 物料名称 */
+    @Excel(name = "物料名称",sort = 4)
     private String materialName;
 
     /** 物料类型 */
+//    @Excel(name = "物料类型",sort = 5)
     private String materialType;
 
     /** 物料图片 */
+    @Excel(name = "物料图片",sort = 5)
     private String materialPhotoUrl;
 
     /** 单位 */
+    @Excel(name = "单位",sort = 6)
     private String unit;
 
     /** 描述 */
+    @Excel(name = "描述",sort = 8)
     private String description;
 
     /** 品牌 */
+    @Excel(name = "品牌",sort = 7)
     private String brand;
 
     /** 加工方式 */
+    @Excel(name = "加工方式",sort = 9,dictType = "processMethod")
     private String processMethod;
 
     /** 计划委外数 */
+    @Excel(name = "计划委外数",sort = 10)
     private BigDecimal plannedOutsourceAmount;
 
 //    实际委外数
+    @Excel(name = "实际委外数",sort = 11)
     private BigDecimal actualOutsourceAmount;
 
 //    关联单号
@@ -78,11 +87,11 @@ public class OutsourceRequisitionDetail extends BaseEntity
     private String deliveryTimeInfo;
 
     /** 已委外领料数 */
-    @Excel(name = "已委外领料数")
+    @Excel(name = "已委外领料数",sort = 12)
     private BigDecimal takenMaterial;
 
     /** 本次委外领料数 */
-    @Excel(name = "本次委外领料数")
+    @Excel(name = "本次委外领料数",sort = 13)
     private BigDecimal takingMaterial;
 
     public void setOutsourceRequisitionDetailId(Long outsourceRequisitionDetailId) 

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceQuoteMapper.java

@@ -36,7 +36,10 @@ public interface OutsourceQuoteMapper
      * @param outsourceQuoteCode 委外报价工序信息
      * @return 委外报价工序信息集合
      */
-    public List<OutsourceQuoteChild> selectOutsourceQuoteChildList(String outsourceQuoteCode);
+    public List<OutsourceQuoteChild> selectOutsourceQuoteChildListByCode(String outsourceQuoteCode);
+
+
+    public List<OutsourceQuoteChild> selectOutsourceQuoteChildList();
 
     /**
      * 新增委外报价
@@ -110,4 +113,6 @@ public interface OutsourceQuoteMapper
      * @return 结果
      */
     public List<OutsourceQuoteChild> selectQuoteChildListByProcessNo(String outsourceProcessNo);
+
+    public List<OutsourceQuoteChild> selectOutsourceQuoteChildByCodes(String[] outsourceQuoteCodes);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/OutsourceRequisitionMapper.java

@@ -98,4 +98,6 @@ public interface OutsourceRequisitionMapper
 
 //    根据领料单号/委外单号/料号组合查询领料详情列表
     public List<OutsourceRequisitionDetail> selectRequisitionDetailByNo(OutsourceRequisitionDetail outsourceRequisitionDetail);
+
+    public List<OutsourceRequisitionDetail> selectOutsourceRequisitionDetailByCodes(String[] requisitionNos);
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/IOutsourceQuoteService.java

@@ -82,4 +82,8 @@ public interface IOutsourceQuoteService
      *  导出列表
      * */
     List<OutsourceQuoteVO> getExportList(OutsourceQuoteVO outsourceQuote);
+
+//    更新审核后信息
+    public int updateAuditOutsourceQuote(OutsourceQuoteVO outsourceQuoteVO);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceProcessServiceImpl.java

@@ -5,17 +5,22 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.github.pagehelper.Page;
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ShiroUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.OutsourceProcess;
+import com.ruoyi.system.domain.SysCustomerVo;
 import com.ruoyi.system.mapper.OutsourceProcessMapper;
 import com.ruoyi.system.service.IOutsourceProcessService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.text.Convert;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 委外工序Service业务层处理
@@ -59,7 +64,14 @@ public class OutsourceProcessServiceImpl implements IOutsourceProcessService
     @Override
     public List<OutsourceProcess> selectOutsourceProcessList(OutsourceProcess outsourceProcess)
     {
-        return outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Page<OutsourceProcess> processList = (Page<OutsourceProcess>)outsourceProcessMapper.selectOutsourceProcessList(outsourceProcess);
+        processList.setTotal(CollectionUtils.isEmpty(processList) ? 0 : processList.getTotal());
+        processList.setPageNum(pageNum);
+        processList.setPageSize(pageSize);
+        return processList;
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java

@@ -73,7 +73,7 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
     public OutsourceQuoteVO selectOutsourceQuoteByOutsourceQuoteId(Long outsourceQuoteId)
     {
         OutsourceQuoteVO outsourceQuoteVO = outsourceQuoteMapper.selectOutsourceQuoteByOutsourceQuoteId(outsourceQuoteId);
-        List<OutsourceQuoteChild> children = outsourceQuoteMapper.selectOutsourceQuoteChildList(outsourceQuoteVO.getOutsourceQuoteCode());
+        List<OutsourceQuoteChild> children = outsourceQuoteMapper.selectOutsourceQuoteChildListByCode(outsourceQuoteVO.getOutsourceQuoteCode());
         outsourceQuoteVO.setOutsourceQuoteChildList(children);
         return outsourceQuoteVO;
     }
@@ -163,6 +163,7 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
             child.setSupplierCode(childVO.getSupplierQuoteCode());
             child.setSupplierName(childVO.getSupplierName());
             child.setTaxRate(childVO.getTaxRate());
+            child.setAuditStatus("0");
         }
         childVO.setProcessAmount(children.size());
         childVO.setOutsourceQuoteChildList(children);
@@ -191,6 +192,22 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
         return outsourceQuoteMapper.updateOutsourceQuote(outsourceQuoteVO);
     }
 
+//    更新审核后信息（更新子表审核状态，防止子表信息丢失
+    @Transactional
+    @Override
+    public int updateAuditOutsourceQuote(OutsourceQuoteVO outsourceQuoteVO){
+        SysUser user = ShiroUtils.getSysUser();
+        outsourceQuoteVO.setUpdateTime(DateUtils.getNowDate());
+        outsourceQuoteVO.setUpdateBy(user.getLoginName());
+        List<OutsourceQuoteChild> quoteChildren = outsourceQuoteMapper.selectOutsourceQuoteChildListByCode(outsourceQuoteVO.getOutsourceQuoteCode());
+        if(StringUtils.isNotEmpty(quoteChildren)){
+            outsourceQuoteMapper.deleteOutsourceQuoteChildByOutsourceQuoteCode(outsourceQuoteVO.getOutsourceQuoteCode());
+            outsourceQuoteVO.setOutsourceQuoteChildList(quoteChildren);
+            insertOutsourceQuoteChild(outsourceQuoteVO);
+        }
+        return outsourceQuoteMapper.updateOutsourceQuote(outsourceQuoteVO);
+    }
+
     /**
      * 删除委外报价信息
      * 
@@ -218,6 +235,10 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
         {
             if (outsourceQuoteChildList.size() > 0)
             {
+                for (OutsourceQuoteChild child:outsourceQuoteChildList) {
+                    child.setOutsourceProcessCode(outsourceQuote.getOutsourceQuoteCode());
+                    child.setAuditStatus(outsourceQuote.getAuditStatus());
+                }
                 outsourceQuoteMapper.batchOutsourceQuoteChild(outsourceQuoteChildList);
             }
         }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseInventoryReportDamageChildMapper.java

@@ -100,4 +100,7 @@ public interface WarehouseInventoryReportDamageChildMapper
 
 //    按单号批量查询详情
     public List<WarehouseInventoryReportDamageChild> selectWarehouseInventoryReportDamageChildByCodes(String[] reportDamageCode);
+
+//    按料号查询报损报告详情列表
+    public List<WarehouseInventoryReportDamageChild> selectWarehouseInventoryReportDamageChildByMaterialNo(String MaterialNo);
 }

ruoyi-admin/src/main/resources/mapper/quality/QualityOrderDetailMapper.xml

@@ -274,4 +274,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update quality_order_detail set del_flag = '0' where quality_order_detail_id = #{qualityOrderDetailId}
     </update>
 
+    <select id="selectQualityOrderDetailByStorageCodeAndno" parameterType="QualityOrderDetail" resultMap="QualityOrderDetailResult">
+        <include refid="selectQualityOrderDetailVo"/>
+        where material_no = #{materialNo}
+        and in_storage_code = #{inStorageCode}
+    </select>
+
 </mapper>

ruoyi-admin/src/main/resources/mapper/system/OutsourceOrderMapper.xml

@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="outsourcePlanCode"    column="outsource_plan_code"    />
         <result property="outsourceStaff"    column="outsource_staff"    />
         <result property="supplierAmount"    column="supplier_amount"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
         <result property="materialAmount"    column="material_amount"    />
         <result property="outsourceMaterialAmount"    column="outsource_material_amount"    />
         <result property="outsourceProcessType"    column="outsource_process_type"    />
@@ -90,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select outsource_order_id, outsource_order_no, outsource_plan_code, outsource_staff, supplier_amount,
                material_amount, outsource_material_amount, outsource_process_type, outsource_process_amount, outsource_total_price,
                outsource_no_price, create_by, create_time, update_by, update_time, use_status, receive_status, warehouse_status, closed_status,
-               remit_status, audit_status, actual_material_amount, actual_process_amount, stock_no, stock_name, receive_person, receive_telephone,
+               remit_status, audit_status, actual_material_amount, actual_process_amount, stock_no, stock_name, receive_person, receive_telephone,supplier_code, supplier_name,
                receive_address,instance_id, instance_type, submit_instance_id, apply_title, apply_time, apply_user, cancel_instance_id, restore_instance_id, cancel_remark
                from outsource_order
     </sql>
@@ -98,10 +100,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutsourceOrderList" parameterType="OutsourceOrderVO" resultMap="OutsourceOrderResult">
         <include refid="selectOutsourceOrderVo"/>
         <where>  
-            <if test="outsourceOrderNo != null  and outsourceOrderNo != ''"> and outsource_order_no = #{outsourceOrderNo}</if>
+            <if test="outsourceOrderNo != null  and outsourceOrderNo != ''"> and outsource_order_no like concat('%', #{outsourceOrderNo}, '%')</if>
             <if test="outsourceStaff != null  and outsourceStaff != ''"> and outsource_staff = #{outsourceStaff}</if>
             <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+                and  create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
+            <if test="supplierCode != null and supplierCode != ''">
+                and  outsource_order_no in ( select outsource_order_no from outsource_order_detail where supplier_code = #{supplierCode})
+            </if>
+            <if test="supplierName != null and supplierName != ''">
+                and  outsource_order_no in ( select outsource_order_no from outsource_order_detail where supplier_name = #{supplierName})
+            </if>
             <if test="useStatus != null  and useStatus != ''"> and use_status = #{useStatus}</if>
             <if test="receiveStatus != null  and receiveStatus != ''"> and receive_status = #{receiveStatus}</if>
             <if test="warehouseStatus != null  and warehouseStatus != ''"> and warehouse_status = #{warehouseStatus}</if>

ruoyi-admin/src/main/resources/mapper/system/OutsourcePlanMapper.xml

@@ -48,12 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutsourcePlanList" parameterType="OutsourcePlan" resultMap="OutsourcePlanResult">
         <include refid="selectOutsourcePlanVo"/>
         <where>  
-            <if test="outsourcePlanCode != null  and outsourcePlanCode != ''"> and outsource_plan_code = #{outsourcePlanCode}</if>
+            <if test="outsourcePlanCode != null  and outsourcePlanCode != ''"> and outsource_plan_code like concat('%', #{outsourcePlanCode}, '%')</if>
-            <if test="associateOrderNo != null  and associateOrderNo != ''"> and associate_order_no = #{associateOrderNo}</if>
+            <if test="associateOrderNo != null  and associateOrderNo != ''"> and associate_order_no like concat('%', #{associateOrderNo}, '%')</if>
             <if test="applicant != null  and applicant != ''"> and applicant = #{applicant}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="source != null  and source != ''"> and source = #{source}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/system/OutsourceProcessMapper.xml

@@ -24,8 +24,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectOutsourceProcessVo"/>
         <where>
             <if test="outsourceProcessId != null  and outsourceProcessId != ''"> and outsource_process_id = #{outsourceProcessId}</if>
-            <if test="outsourceProcessNo != null  and outsourceProcessNo != ''"> and outsource_process_no = #{outsourceProcessNo}</if>
+            <if test="outsourceProcessNo != null  and outsourceProcessNo != ''"> and outsource_process_no like concat('%', #{outsourceProcessNo}, '%')</if>
+            <if test="outsourceProcessCode != null  and outsourceProcessCode != ''"> and outsource_process_code like concat('%', #{outsourceProcessCode}, '%')</if>
             <if test="outsourceProcessName != null  and outsourceProcessName != ''"> and outsource_process_name like concat('%', #{outsourceProcessName}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
     

ruoyi-admin/src/main/resources/mapper/system/OutsourceQuoteMapper.xml

@@ -60,13 +60,15 @@
     <select id="selectOutsourceQuoteList" parameterType="OutsourceQuoteVO" resultMap="OutsourceQuoteResult">
         <include refid="selectOutsourceQuoteVo"/>
         <where>
-            <if test="outsourceQuoteCode != null  and outsourceQuoteCode != ''"> and outsource_quote_code = #{outsourceQuoteCode}</if>
+            <if test="outsourceQuoteCode != null  and outsourceQuoteCode != ''"> and outsource_quote_code like concat('%', #{outsourceQuoteCode}, '%')</if>
-            <if test="supplierQuoteCode != null  and supplierQuoteCode != ''"> and supplier_quote_code = #{supplierQuoteCode}</if>
+            <if test="supplierQuoteCode != null  and supplierQuoteCode != ''"> and supplier_quote_code like concat('%', #{supplierQuoteCode}, '%')</if>
             <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
             <if test="taxRate != null "> and tax_rate = #{taxRate}</if>
             <if test="pricingDate != null  and pricingDate != ''"> and pricingDate = #{pricingDate}</if>
+            <if test="params.beginPricingTime != null and params.beginPricingTime != '' and params.endPricingTime != null and params.endPricingTime != ''"> and pricingDate between #{params.beginPricingTime} and #{params.endPricingTime}</if>
             <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
         </where>
         order by audit_status asc, create_time desc
@@ -77,12 +79,17 @@
         where outsource_quote_id = #{outsourceQuoteId}
     </select>
 
-    <select id="selectOutsourceQuoteChildList" resultType="OutsourceQuoteChild" resultMap="OutsourceQuoteChildResult">
+    <select id="selectOutsourceQuoteChildListByCode" resultType="OutsourceQuoteChild" resultMap="OutsourceQuoteChildResult">
         select outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status,charge_unit
         from outsource_quote_child
         where outsource_quote_code = #{outsource_quote_code}
     </select>
 
+    <select id="selectOutsourceQuoteChildList" resultType="OutsourceQuoteChild" resultMap="OutsourceQuoteChildResult">
+        select outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status,charge_unit
+        from outsource_quote_child
+    </select>
+
     <insert id="insertOutsourceQuote" parameterType="OutsourceQuoteVO" useGeneratedKeys="true" keyProperty="outsourceQuoteId">
         insert into outsource_quote
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -207,4 +214,12 @@
     <update id="restoreOutsourceQuoteById" parameterType="Long">
         update outsource_quote set del_flag = '0' where outsource_quote_id = #{outsourceQuoteId}
     </update>
+
+    <select id="selectOutsourceQuoteChildByCodes" parameterType="String" resultMap="OutsourceQuoteChildResult">
+        select outsource_quote_child_id, outsource_quote_code, outsource_process_code, outsource_process_no, outsource_process_name, remark, tax_rate, material_rmb, material_noRmb, supplier_code, supplier_name, create_by, create_time, update_by, update_time, audit_status,charge_unit from outsource_quote_child
+        where outsource_quote_code in
+        <foreach item="OutsourceQuoteCode" collection="array" open="(" separator="," close=")">
+            #{OutsourceQuoteCode}
+        </foreach>
+    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/system/OutsourceRequisitionMapper.xml

@@ -72,10 +72,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOutsourceRequisitionList" parameterType="OutsourceRequisitionVO" resultMap="OutsourceRequisitionResult">
         <include refid="selectOutsourceRequisitionVo"/>
         <where>  
-            <if test="outsourceRequisitionNo != null  and outsourceRequisitionNo != ''"> and outsource_requisition_no = #{outsourceRequisitionNo}</if>
+            <if test="outsourceRequisitionNo != null  and outsourceRequisitionNo != ''"> and outsource_requisition_no like concat('%', #{outsourceRequisitionNo}, '%')</if>
-            <if test="outsourceOrderNo != null  and outsourceOrderNo != ''"> and outsource_order_no = #{outsourceOrderNo}</if>
+            <if test="outsourceOrderNo != null  and outsourceOrderNo != ''"> and outsource_order_no like concat('%', #{outsourceOrderNo}, '%')</if>
             <if test="requisitionPerson != null  and requisitionPerson != ''"> and requisition_person = #{requisitionPerson}</if>
             <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
     </select>
     
@@ -204,4 +205,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectOutsourceRequisitionDetailByCodes" parameterType="String" resultMap="OutsourceRequisitionDetailResult">
+        <include refid="selectOutsourceRequisitionDetail"/>
+        where outsource_requisition_no in
+        <foreach item="outsourceRequisitionNo" collection="array" open="(" separator="," close=")">
+            #{outsourceRequisitionNo}
+        </foreach>
+    </select>
 </mapper>

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseInventoryReportDamageChildMapper.xml

@@ -211,4 +211,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </select>
 
+    <select id="selectWarehouseInventoryReportDamageChildByMaterialNo" parameterType="String" resultMap="WarehouseInventoryReportDamageChildResult">
+        <include refid="selectWarehouseInventoryReportDamageChildVo"/>
+        where material_no = #{materialNo}
+    </select>
+
 </mapper>

ruoyi-admin/src/main/resources/templates/system/outsource_order/closed.html

@@ -7,17 +7,19 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-outsource_order_closed" th:object="${outsourceOrder}">
         <input name="outsourceOrderId" th:field="*{outsourceOrderId}" type="hidden">
-        <div class="col-xs-12">
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">委外单号：</label>
-                <div class="col-sm-8">
+                <div class="col-sm-6">
-                    <div class="form-control-static" th:text="${outsourceOrder.outsourceOrderCode}"></div>
+                    <input class="form-control" name="outsourceOrderCode" th:field="*{outsourceOrderNo}">
                 </div>
             </div>
-        </div>
+            <div class="form-group">
-        <h5>已选择供应商：</h5>
 
-        <div class="col-sm-12 table-striped">
+            </div>
+        <div class="col-sm-8" style="padding-left: 80px;">
+            <h5>已选择供应商：</h5>
+        </div>
+        <div class="col-xs-8 table-striped" style="padding-left: 80px;">
             <table id="bootstrap-table"></table>
         </div>
 
@@ -26,14 +28,20 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var prefix = ctx + "system/outsource_order";
-    $("#form-outsource_process-edit").validate({
+    $("#outsource_order_closed").validate({
         focusCleanup: true,
 
     });
-
+    var outsourceOrder = [[${outsourceOrder}]];
     $(function() {
+        // console.log(outsourceOrder);
         var options = {
             data: [[${outsourceOrder.outsourceOrderDetailList}]],
+            pagination: false,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
             columns: [
                 {
                     field: 'supplierCode',

ruoyi-admin/src/main/resources/templates/system/outsource_order/outsource_order.html

@@ -19,16 +19,46 @@
                                 <input type="text" name="outsourceStaff"/>
                             </li>
                             <li>
-                                <label>录入人：</label>
+                                <label>供应商代码：</label>
-                                <input type="text" name="createBy"/>
+                                <input name="supplierCode" type="text"/>
                             </li>
                             <li>
-                                <label>录入时间：</label>
+                                <label>供应商名称：</label>
-                                <input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/>
+                                <input type="text" name="supplierName"/>
                             </li>
                             <li>
-                                <label>实际委外物料合计：</label>
+                                <label>审核状态：</label>
-                                <input type="text" name="actualMaterialAmount"/>
+                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>使用状态：</label>
+                                <select name="useStatus" th:with="type=${@dict.getType('useStatus')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>收货状态：</label>
+                                <select name="eceiptStatus" th:with="type=${@dict.getType('quality_delivery_status')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li>
+                                <label>打款结案状态：</label>
+                                <select name="paymentStatus" th:with="type=${@dict.getType('sys_pay_close')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间： </label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -46,7 +76,7 @@
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:outsource_order:export">-->
 <!--                    <i class="fa fa-download"></i> 导出合同-->
 <!--                </a>-->
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_order:add">
+                <a class="btn btn-success" onclick="closedOrder()" shiro:hasPermission="system:outsource_order:add">
                     <i class="fa fa-plus"></i> 结案
                 </a>
             </div>
@@ -68,7 +98,7 @@
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
         var receiveStatusDatas = [[${@dict.getType('quality_delivery_status')}]];
         var remitStatusDatas = [[${@dict.getType('sys_close_status')}]];
-        var closedStatusDatas = [[${@dict.getType('sys_close_status')}]];
+        var closedStatusDatas = [[${@dict.getType('sys_pay_close')}]];
 
 
         var prefix = ctx + "system/outsource_order";
@@ -82,9 +112,6 @@
             $.modal.open("新增委外入库单", prefix + "/addStorage/" + outsourceOrderNo)
         }
         $(function() {
-            function addRequisition(outsourceOrderNo) {
-                $.modal.open("新增委外领料单", prefix + "/addRequisition/" + outsourceOrderNo);
-            }
 
             var options = {
                 url: prefix + "/list",
@@ -367,6 +394,16 @@
                 $.modal.open("作废", url);
             })
         }
+        function closedOrder(){
+            let data = $("#bootstrap-table").bootstrapTable("getSelections");
+            if(data.length === 1){
+                var url = prefix + "/closed/" + data[0].outsourceOrderNo;
+                $.modal.open("结案", url);
+            }else {
+                $.modal.alertError("请选择一条订单数据")
+                return;
+            }
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/outsource_plan/addOutsourceOrder.html

@@ -236,7 +236,7 @@
             var $MaterialNumDiv =
                 $('<div class="col-xs-10" style="height: 60px">' +
                     '<div class="form-group">' +
-                    '<div class="col-sm-3" style="padding: 0px; padding-top: 15px; padding-left: 15px">' +
+                    '<div class="col-sm-3" style="padding: 0px; padding-top: 15px; padding-left: 5px">' +
                     '<h3>' +
                     '<label for="outMaterialNum" style="color: blue;" class="control-label is-required">实际委外数:</label>' +
                     '</h3>' +
@@ -283,7 +283,7 @@
                             '</div>' +
                             '<div class="col-xs-8" id="chargeUnit-'+processSelectId+'">' +
                             '<div class="col-sm-2" style="padding: 0px">' +
-                            '<label class="control-label is-required" style="color: blue;padding-left: 15px">计价单位:</label>' +
+                            '<label class="control-label is-required" style="color: blue;padding-left: 5px">计价单位:</label>' +
                             '</div>' +
                             '<div class="col-sm-3" style="padding-left: 0px">' +
                             '<select required name="chargeUnit"  data-id="chargeUnit" id="'+ processSelectId +'" class="form-control" onchange="unitChange(\'' + processSelectId + '\', \'' + processTableId  + '\')">' +
@@ -446,7 +446,7 @@
         var $deliveryTimeContent = $(
             ''+
             '<div class="col-xs-8 deliveryTime-'+processTableId+'" style="margin-left: 15px;padding-left: 0px;">' +
-            '<label class="col-sm-2" style="margin-top: 5px;">计划交付时间: </label>' +
+            '<label class="col-sm-3" style="margin-top: 5px;">计划交付时间: </label>' +
             '<div class ="col-sm-4">' +
             '<div class="input-group date"> ' +
             '<input type="text" name="deliveryTime" class="form-control supplierDeliveryTime" id="deliveryTime_' + processTableId + '">' +
@@ -492,16 +492,13 @@
                     $(  '<div class="col-xs-12" name="supplier-' + processTableId + '_' + supplierIndex + '" style="height: 40px;">' +
                         '<div class="card-header suppplier_card" id = "supplier-' + processTableId + '_' + supplierIndex + '" style="height: 40px; margin-top: 10px;">' +
                         '<div class="row">' +
-                        '<div class="card-text" style="padding-left: 30px;">' +
+                        '<div class="card-text" style="padding-left: 50px;">' +
                         '<input type="radio" id="supplier-' + processTableId + '_' + supplierIndex + '" name="supplier-' + processTableId + '" required>' +
                         '<span class="supplierCode">' + supplier.supplierCode + '</span>' + '-' +
                         '<span class="supplierName">' + supplier.supplierName + '</span>' +
                         '-最新不含税委外价: ' + '<span id="materialNormb-' + processTableId + '" class="materialNormb">' + supplier.materialNormb + '</span>' +
                         ' RMB  最新含税委外价: ' + '<span id="materialRmb-' + processTableId + '" class="materialRmb">' + supplier.materialRmb + '</span> RMB ' +
                         '<span class="chargeUnit" hidden="hidden"  >' + chargeUnit + '</span>' +
-                        // '<span class="supplierCorrelationCode"  hidden="hidden"  >' + material.correlationCodes + '</span>' +
-                        // '<span class="supplierPurchaseQuoteCode" hidden="hidden" >' + supplier.purchaseQuoteCode + '</span>' +
-
                         '</div>' +
                         '</div>' +
                         '</div>' +

ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html

@@ -1,70 +1,58 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <th:block th:include="include :: header('修改委外计划')" />
+    <th:block th:include="include :: header('委外计划详情')" />
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-outsource_plan-edit" th:object="${outsourcePlan}">
-        <h4 class="form-header h4">委外计划信息</h4>
         <input name="outsourcePlanId" th:field="*{outsourcePlanId}" type="hidden">
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label is-required">委外计划单号：</label>
-                <label class="col-sm-3 control-label is-required">委外计划单号：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="outsourcePlanCode" id="outsourcePlanCode" th:field="*{outsourcePlanCode}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.outsourcePlanCode}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">关联单号：</label>
-                <label class="col-sm-3 control-label">关联单号：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="associateOrderNo" id="associateOrderNo" th:field="*{associateOrderNo}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.associateOrderNo}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">申请人：</label>
-                <label class="col-sm-3 control-label">申请人：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="applicant" id="applicant" th:field="*{applicant}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.applicant}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">物料总计：</label>
-                <label class="col-sm-3 control-label">物料总计：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="materialAmount" id="materialAmount" th:field="*{materialAmount}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.materialAmount}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">数量总计：</label>
-                <label class="col-sm-3 control-label">数量总计：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="totalAmount" id="totalAmount" th:field="*{totalAmount}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.totalAmount}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">委外工序合计：</label>
-                <label class="col-sm-3 control-label">委外工序合计：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="outsourceProcessAmount" id="outsourceProcessAmount" th:field="*{outsourceProcessAmount}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.outsourceProcessAmount}"></div>
-                </div>
             </div>
         </div>
-        <div class="col-xs-12">
+        <div class="form-group">
-            <div class="form-group">
+            <label class="col-sm-3 control-label">来源：</label>
-                <label class="col-sm-3 control-label">来源：</label>
+            <div class="col-sm-6">
-                <div class="col-sm-8">
+                <input type="text" class="form-control" name="source" id="source" th:field="*{source}" readonly>
-                    <div class="form-control-static" th:text="${outsourcePlan.source}"></div>
-                </div>
             </div>
         </div>
-        <h4 class="form-header h4">委外计划详情信息</h4>
+        <div class="form-group">
+
+        </div>
+        <h4 class="form-header h4" style="height: 30px;">委外计划详情信息</h4>
         <div class="row">
             <div class="col-sm-12">
                 <div class="col-sm-12 select-table table-striped">

ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html

@@ -23,20 +23,22 @@
                                 <input type="text" name="applicant"/>
                             </li>
                             <li>
-                                <label>审核状态：</label>
+                                <label>状态：</label>
-                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
+                                <select name="status" th:with="type=${@dict.getType('purchase_plan_status')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
-                                <label>来源：</label>
-                                <input type="text" name="source"/>
-                            </li>
                             <li>
                                 <label>录入时间：</label>
-                                <input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             </li>
+<!--                            <li>-->
+<!--                                <label>来源：</label>-->
+<!--                                <input type="text" name="source"/>-->
+<!--                            </li>-->
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -61,6 +63,8 @@
         var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]];
         var processMethodDatas = [[${@dict.getType('processMethod')}]];
         var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+        var sourceTypeDatas = [[${@dict.getType('purchase_plan_source')}]];
+        var planStatusDatas = [[${@dict.getType('purchase_plan_status')}]];
 
         var prefix = ctx + "system/outsource_plan";
 
@@ -82,7 +86,10 @@
                 },
                 {
                     field: 'status',
-                    title: '状态'
+                    title: '状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(planStatusDatas, value);
+                    }
                 },
 
                 {
@@ -117,7 +124,10 @@
 
                 {
                     field: 'source',
-                    title: '来源'
+                    title: '来源',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(sourceTypeDatas, value);
+                    }
                 },
                 {
                     field: 'applicant',

ruoyi-admin/src/main/resources/templates/system/outsource_process/detail.html

@@ -5,51 +5,34 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-user-edit">
+    <form class="form-horizontal m" id="form-process-detail" th:object="${outsourceProcess}">
-        <div class="form-group">
+        <div class="form-group" >
             <label class="col-sm-3 control-label">委外工序编号：</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
-                <div class="form-control-static" th:text="${outsourceProcess.outsourceProcessNo}"></div>
+                <input type="text" class="form-control" name="outsourceProcessNo" id="outsourceProcessNo" th:field="*{outsourceProcessNo}" readonly>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">委外工序名称：</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
-                <div class="form-control-static" th:text="${outsourceProcess.outsourceProcessName}"></div>
+                <input type="text" class="form-control" name="outsourceProcessName" id="outsourceProcessName" th:field="*{outsourceProcessName}" readonly>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
-                <div class="form-control-static" th:text="${outsourceProcess.remark}"></div>
+                <input type="text" class="form-control" name="remark" id="remark" th:field="*{remark}" readonly>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">录入人：</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
-                <div class="form-control-static" th:text="${outsourceProcess.createBy}"></div>
+                <input type="text" class="form-control" name="createBy" id="createBy" th:field="*{createBy}" readonly>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">录入时间：</label>
-            <div class="col-sm-8">
-                <div class="form-control-static" th:text="${outsourceProcess.createTime}"></div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">更新人：</label>
-            <div class="col-sm-8">
-                <div class="form-control-static" th:text="${outsourceProcess.updateBy}"></div>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">更新时间：</label>
-            <div class="col-sm-8">
-                <div class="form-control-static" th:text="${outsourceProcess.updateTime}"></div>
             </div>
         </div>
     </form>
 </div>
+
 <th:block th:include="include :: footer" />
 <script type="text/javascript">
     var prefix = ctx + "system/outsource_process";

ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html

@@ -4,38 +4,38 @@
     <th:block th:include="include :: header('委外工序列表')" />
 </head>
 <body class="gray-bg">
-     <div class="container-div">
+<div class="container-div">
-        <div class="row">
+    <div class="row">
-            <div class="col-sm-12 search-collapse">
+        <div class="col-sm-12 search-collapse">
-                <form id="formId">
+            <form id="formId">
-                    <div class="select-list">
+                <div class="select-list">
-                        <ul>
+                    <ul>
-                            <li>
+                        <li>
-                                <label class="in">委外工序ID：</label>
+                            <label class="in">委外工序ID：</label>
-                                <input type="text" name="outsourceProcessCode"/>
+                            <input type="text" name="outsourceProcessCode"/>
-                            </li>
+                        </li>
-                            <li>
+                        <li>
-                                <label class="in">委外工序编号：</label>
+                            <label class="in">委外工序编号：</label>
-                                <input type="text" name="outsourceProcessNo"/>
+                            <input type="text" name="outsourceProcessNo"/>
-                            </li>
+                        </li>
-                            <li>
+                        <li>
-                                <label class="in">委外工序名称：</label>
+                            <label class="in">委外工序名称：</label>
-                                <input type="text" name="outsourceProcessName"/>
+                            <input type="text" name="outsourceProcessName"/>
-                            </li>
+                        </li>
-                            <li class="select-time">
+                        <li class="select-time">
-                                <label>录入时间： </label>
+                            <label>录入时间： </label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
-                                <span>-</span>
+                            <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
-                            </li>
+                        </li>
-                            <li>
+                        <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
+                        </li>
-                        </ul>
+                    </ul>
-                    </div>
+                </div>
-                </form>
+            </form>
-            </div>
+        </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_process:add">
@@ -47,11 +47,6 @@
             </div>
         </div>
     </div>
-     <style>
-        .in{
-            width: 200px;
-        }
-     </style>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:outsource_process:edit')}]];

ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html

@@ -35,9 +35,9 @@
                             </li>
                             <li>
                                 <label>录入时间：</label>
-                                <input type="text" class="time-input" id="createstartTime" placeholder="开始时间" name="params[beginTime]"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="createendTime" placeholder="结束时间" name="params[endTime]"/>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             </li>
                             <li>
                                 <label>录入人：</label>
@@ -45,9 +45,9 @@
                             </li>
                             <li>
                                 <label>定价日期：</label>
-                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                                <input type="text" class="time-input" id="pricingStartTime" placeholder="开始时间" name="params[beginPricingTime]"/>
                                 <span>-</span>
-                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                                <input type="text" class="time-input" id="pricingEndTime" placeholder="结束时间" name="params[endPricingTime]"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -62,7 +62,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_quote:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:outsource_quote:export">
+                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:outsource_quote:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -271,6 +271,28 @@
             $.modal.open("修改委外报价",url,1000,600);
         }
 
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("outsourceQuoteCode");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.loading("正在导出数据，请稍后...");
+            $.modal.confirm(tipMsg, function () {
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
     </script>
 </body>
 </html>

ruoyi-admin/src/main/resources/templates/system/outsource_requisition/outsource_requisition.html

@@ -22,9 +22,11 @@
                                 <label>领料员：</label>
                                 <input type="text" name="requisitionPerson"/>
                             </li>
-                            <li>
+                            <li class="select-time">
-                                <label>录入时间：</label>
+                                <label>录入时间： </label>
-                                <input type="text" class="time-input" placeholder="请选择录入时间" name="createTime"/>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -36,7 +38,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:outsource_requisition:export">
+                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:outsource_requisition:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -238,6 +240,28 @@
             };
             $.table.init(options);
         });
+        // 导出
+        function exportExcel() {
+            var ids = $.table.selectColumns("outsourceRequisitionNo");
+            var dataParam = $("#formId").serializeArray();
+
+            let tipMsg = "确定导出当前所有数据吗?";
+            if ($.common.isNotEmpty(ids)) {
+                tipMsg = `确定导出 ${ids} 数据吗?`;
+                dataParam.push({ "name": "ids", "value": ids });
+            }
+            $.modal.loading("正在导出数据，请稍后...");
+            $.modal.confirm(tipMsg, function () {
+                $.post( prefix + "/export", dataParam, function (result) {
+                    if (result.code === web_status.SUCCESS) {
+                        window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+                    } else {
+                        $.modal.alertError(result.msg);
+                    }
+                    $.modal.closeLoading();
+                });
+            });
+        }
     </script>
 </body>
 </html>