0412更新

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -220,10 +220,112 @@ public class DailyPlanController {
         List<GenerateReportData> resultList = dailyPlanService.getGenerateReportList(generateReportData);
         return R.ok().put("rows", resultList).put("total",resultList.size());
     }
-
     @PostMapping("/saveGenerateReport")
     public R saveGenerateReport(@RequestBody GenerateReportData generateReportData){
 
         return dailyPlanService.saveGenerateReport(generateReportData);
     }
+
+    /**
+     * @Description TODO
+     * @Title getWorkCenterData
+      * @param
+     * @author rq
+     * @date 2022/7/15 17:41
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getWorkCenterData")
+    public R getWorkCenterData(@RequestBody WorkCenterData inData){
+        List<WorkCenterData> resultList = dailyPlanService.getWorkCenterData(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+    /**
+     * @Description TODO
+     * @Title getOperatorData
+     * @param
+     * @author rq
+     * @date 2022/7/15 17:41
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getOperatorData")
+    public R getOperatorData(@RequestBody OperatorData operatorData){
+        List<OperatorData> resultList = dailyPlanService.getOperatorData(operatorData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
+    /**
+     * @Description TODO
+     * @Title getWorkCenterOperatorData
+     * @param
+     * @author rq
+     * @date 2022/7/15 17:41
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getWorkCenterOperatorData")
+    public R getWorkCenterOperatorData(@RequestBody WorkCenterData inData){
+        List<WorkCenterData> resultList = dailyPlanService.getWorkCenterOperatorData(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+
+    /**
+     * @Description TODO
+     * @Title addSkill
+      * @param inData
+     * @author rq
+     * @date 2022/7/19 17:09
+     * @return R
+     * @throw
+     */
+    @PostMapping("/addSkill")
+    public R addSkill(@RequestBody WorkCenterData inData){
+        dailyPlanService.addSkill(inData);
+        return R.ok();
+    }
+
+    /**
+     * @Description TODO
+     * @Title deleteSkill
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:09
+     * @return R
+     * @throw
+     */
+    @PostMapping("/deleteSkill")
+    public R deleteSkill(@RequestBody WorkCenterData inData){
+        dailyPlanService.deleteSkill(inData);
+        return R.ok();
+    }
+
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:09
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getShopOrderRoutingData")
+    public R getShopOrderRoutingData(@RequestBody ShopOrderRoutingData inData){
+        List<ShopOrderRoutingData> resultList = dailyPlanService.getShopOrderRoutingData(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:09
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getSOTastRoutingData")
+    public R getSOTastRoutingData(@RequestBody ShopOrderRoutingData inData){
+        List<ShopOrderRoutingData> resultList = dailyPlanService.getSOTastRoutingData(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
 }

src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@@ -1,8 +1,6 @@
 package com.heai.modules.production.dao;
 
-import com.heai.modules.production.entity.DailyPlanInData;
-import com.heai.modules.production.entity.GenerateReportData;
-import com.heai.modules.production.entity.ShopOrderData;
+import com.heai.modules.production.entity.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -45,4 +43,91 @@ public interface DailyPlanMapper {
      * @throws:
     */
     List<ShopOrderData> getShopOrderList(DailyPlanInData dailyPlanInData);
+
+    /**
+     * @Description TODO
+     * @Title getOperatorData
+     * @param operatorData
+     * @author rq
+     * @date 2022/7/15 17:38
+     * @return OperatorData
+     * @throw
+     */
+    List<OperatorData> getOperatorData(OperatorData operatorData);
+
+    /**
+     * @Description 技能矩阵专用！！！
+     * @Title getWorkCenterData
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 16:20
+     * @return List<WorkCenterData>
+     * @throw
+     */
+    List<WorkCenterData> getWorkCenterData(WorkCenterData inData);
+
+    /**
+     * @Description 技能矩阵专用！！！
+     * @Title getWorkCenterOperatorData
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 16:20
+     * @return List<WorkCenterData>
+     * @throw
+     */
+    List<WorkCenterData> getWorkCenterOperatorData(WorkCenterData inData);
+
+    /**
+     * @Description 添加技能
+     * @Title addSkill
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:14
+     * @return void
+     * @throw
+     */
+    void addSkill(WorkCenterData inData);
+
+    /**
+     * @Description 删除技能
+     * @Title deleteSkill
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:14
+     * @return void
+     * @throw
+     */
+    void deleteSkill(WorkCenterData inData);
+
+    /**
+     * @Description TODO
+     * @Title checkWorkCenterOperatorData
+      * @param
+     * @author rq
+     * @date 2022/7/19 17:47
+     * @return List<WorkCenterData>
+     * @throw
+     */
+    List<WorkCenterData> checkWorkCenterOperatorData(WorkCenterData inData);
+
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+     * @param
+     * @author rq
+     * @date 2022/7/21 17:03
+     * @return List<ShopOrderRoutingData>
+     * @throw
+     */
+    List<ShopOrderRoutingData> getShopOrderRoutingData(ShopOrderRoutingData inData);
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+     * @param
+     * @author rq
+     * @date 2022/7/21 17:03
+     * @return List<ShopOrderRoutingData>
+     * @throw
+     */
+    List<ShopOrderRoutingData> getSOTastRoutingData(ShopOrderRoutingData inData);
 }

src/main/java/com/heai/modules/production/entity/OperatorData.java

@@ -0,0 +1,115 @@
+package com.heai.modules.production.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+public class OperatorData {
+    /**
+     *
+     */
+    private String site;
+
+    /**
+     *
+     */
+    private String operatorID;
+
+    /**
+     *
+     */
+    private String operatorName;
+
+    /**
+     *
+     */
+    private String active;
+
+    /**
+     *
+     */
+    private String department;
+
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdDate;
+
+    /**
+     *
+     */
+    private String passwords;
+
+    /**
+     *
+     */
+    private String lineLeader;
+
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getOperatorID() {
+        return operatorID;
+    }
+
+    public void setOperatorID(String operatorID) {
+        this.operatorID = operatorID;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getPasswords() {
+        return passwords;
+    }
+
+    public void setPasswords(String passwords) {
+        this.passwords = passwords;
+    }
+
+    public String getLineLeader() {
+        return lineLeader;
+    }
+
+    public void setLineLeader(String lineLeader) {
+        this.lineLeader = lineLeader;
+    }
+}
+

src/main/java/com/heai/modules/production/entity/ShopOrderRoutingData.java

@@ -0,0 +1,224 @@
+package com.heai.modules.production.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Alias("ShopOrderRoutingData")
+public class ShopOrderRoutingData extends ShopOrderData{
+    private float itemNo;
+    private String operationDesc;
+    private String workCenterNo;
+    private float machSetupTime;
+    private float machRunFactor;
+    private String factorUnitDB;
+    private String factorUnit;
+    private float qtyRequired;
+    private float qtyReported;
+    private float qtyApprove;
+    private float timeRequired;
+    private float timeReported;
+    private float efficiency;
+    private float scheduledQty;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate1;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate1;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate2;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate2;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate3;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate3;
+    private String planStatus;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date orderDate;
+    public float getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(float itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    public String getOperationDesc() {
+        return operationDesc;
+    }
+
+    public void setOperationDesc(String operationDesc) {
+        this.operationDesc = operationDesc;
+    }
+
+    public String getWorkCenterNo() {
+        return workCenterNo;
+    }
+
+    public void setWorkCenterNo(String workCenterNo) {
+        this.workCenterNo = workCenterNo;
+    }
+
+    public float getMachSetupTime() {
+        return machSetupTime;
+    }
+
+    public void setMachSetupTime(float machSetupTime) {
+        this.machSetupTime = machSetupTime;
+    }
+
+    public float getMachRunFactor() {
+        return machRunFactor;
+    }
+
+    public void setMachRunFactor(float machRunFactor) {
+        this.machRunFactor = machRunFactor;
+    }
+
+    public String getFactorUnitDB() {
+        return factorUnitDB;
+    }
+
+    public void setFactorUnitDB(String factorUnitDB) {
+        this.factorUnitDB = factorUnitDB;
+    }
+
+    public String getFactorUnit() {
+        return factorUnit;
+    }
+
+    public void setFactorUnit(String factorUnit) {
+        this.factorUnit = factorUnit;
+    }
+
+    public float getQtyRequired() {
+        return qtyRequired;
+    }
+
+    public void setQtyRequired(float qtyRequired) {
+        this.qtyRequired = qtyRequired;
+    }
+
+    public float getQtyReported() {
+        return qtyReported;
+    }
+
+    public void setQtyReported(float qtyReported) {
+        this.qtyReported = qtyReported;
+    }
+
+    public float getQtyApprove() {
+        return qtyApprove;
+    }
+
+    public void setQtyApprove(float qtyApprove) {
+        this.qtyApprove = qtyApprove;
+    }
+
+    public float getTimeRequired() {
+        return timeRequired;
+    }
+
+    public void setTimeRequired(float timeRequired) {
+        this.timeRequired = timeRequired;
+    }
+
+    public float getTimeReported() {
+        return timeReported;
+    }
+
+    public void setTimeReported(float timeReported) {
+        this.timeReported = timeReported;
+    }
+
+    public float getEfficiency() {
+        return efficiency;
+    }
+
+    public void setEfficiency(float efficiency) {
+        this.efficiency = efficiency;
+    }
+
+    public float getScheduledQty() {
+        return scheduledQty;
+    }
+
+    public void setScheduledQty(float scheduledQty) {
+        this.scheduledQty = scheduledQty;
+    }
+
+    public Date getStartDate1() {
+        return startDate1;
+    }
+
+    public void setStartDate1(Date startDate1) {
+        this.startDate1 = startDate1;
+    }
+
+    public Date getEndDate1() {
+        return endDate1;
+    }
+
+    public void setEndDate1(Date endDate1) {
+        this.endDate1 = endDate1;
+    }
+
+    public Date getStartDate2() {
+        return startDate2;
+    }
+
+    public void setStartDate2(Date startDate2) {
+        this.startDate2 = startDate2;
+    }
+
+    public Date getEndDate2() {
+        return endDate2;
+    }
+
+    public void setEndDate2(Date endDate2) {
+        this.endDate2 = endDate2;
+    }
+
+    public Date getStartDate3() {
+        return startDate3;
+    }
+
+    public void setStartDate3(Date startDate3) {
+        this.startDate3 = startDate3;
+    }
+
+    public Date getEndDate3() {
+        return endDate3;
+    }
+
+    public void setEndDate3(Date endDate3) {
+        this.endDate3 = endDate3;
+    }
+
+    public String getPlanStatus() {
+        return planStatus;
+    }
+
+    public void setPlanStatus(String planStatus) {
+        this.planStatus = planStatus;
+    }
+
+    public Date getOrderDate() {
+        return orderDate;
+    }
+
+    public void setOrderDate(Date orderDate) {
+        this.orderDate = orderDate;
+    }
+
+
+}

src/main/java/com/heai/modules/production/entity/WorkCenterData.java

@@ -0,0 +1,224 @@
+package com.heai.modules.production.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Alias("WorkCenterData")
+public class WorkCenterData {
+    /**
+     *
+     */
+    private String site;
+
+    /**
+     *
+     */
+    private String workCenterNo;
+
+    /**
+     *
+     */
+    private String workCenterDesc;
+
+    /**
+     *
+     */
+    private String workCenterTypeDb;
+
+    /**
+     *
+     */
+    private String workCenterType;
+
+    /**
+     *
+     */
+    private Double averageCapacity;
+
+    /**
+     *
+     */
+    private Double efficiency;
+
+    /**
+     *
+     */
+    private Double utilization;
+
+    /**
+     *
+     */
+    private String capacityTypeDb;
+
+    /**
+     *
+     */
+    private String capacityType;
+
+    /**
+     *
+     */
+    private String umid;
+
+    /**
+     *
+     */
+    private String active;
+
+    /**
+     *
+     */
+    private String remark;
+    private String operatorID;
+    /**
+     *
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdDate;
+
+    /**
+     *
+     */
+    private String proLineNo;
+    private String user;
+    public String getSite() {
+        return site;
+    }
+
+    public void setSite(String site) {
+        this.site = site;
+    }
+
+    public String getWorkCenterNo() {
+        return workCenterNo;
+    }
+
+    public void setWorkCenterNo(String workCenterNo) {
+        this.workCenterNo = workCenterNo;
+    }
+
+    public String getWorkCenterDesc() {
+        return workCenterDesc;
+    }
+
+    public void setWorkCenterDesc(String workCenterDesc) {
+        this.workCenterDesc = workCenterDesc;
+    }
+
+    public String getWorkCenterTypeDb() {
+        return workCenterTypeDb;
+    }
+
+    public void setWorkCenterTypeDb(String workCenterTypeDb) {
+        this.workCenterTypeDb = workCenterTypeDb;
+    }
+
+    public String getWorkCenterType() {
+        return workCenterType;
+    }
+
+    public void setWorkCenterType(String workCenterType) {
+        this.workCenterType = workCenterType;
+    }
+
+    public Double getAverageCapacity() {
+        return averageCapacity;
+    }
+
+    public void setAverageCapacity(Double averageCapacity) {
+        this.averageCapacity = averageCapacity;
+    }
+
+    public Double getEfficiency() {
+        return efficiency;
+    }
+
+    public void setEfficiency(Double efficiency) {
+        this.efficiency = efficiency;
+    }
+
+    public Double getUtilization() {
+        return utilization;
+    }
+
+    public void setUtilization(Double utilization) {
+        this.utilization = utilization;
+    }
+
+    public String getCapacityTypeDb() {
+        return capacityTypeDb;
+    }
+
+    public void setCapacityTypeDb(String capacityTypeDb) {
+        this.capacityTypeDb = capacityTypeDb;
+    }
+
+    public String getCapacityType() {
+        return capacityType;
+    }
+
+    public void setCapacityType(String capacityType) {
+        this.capacityType = capacityType;
+    }
+
+    public String getUmid() {
+        return umid;
+    }
+
+    public void setUmid(String umid) {
+        this.umid = umid;
+    }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Date createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public String getProLineNo() {
+        return proLineNo;
+    }
+
+    public void setProLineNo(String proLineNo) {
+        this.proLineNo = proLineNo;
+    }
+
+    public String getOperatorID() {
+        return operatorID;
+    }
+
+    public void setOperatorID(String operatorID) {
+        this.operatorID = operatorID;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+}
+

src/main/java/com/heai/modules/production/service/DailyPlanService.java

@@ -181,4 +181,84 @@ public interface DailyPlanService  {
      * @throws:
      */
     ShopOrderData getShopOrder(DailyPlanInData dailyPlanInData);
+
+
+    /**
+     * @Description TODO
+     * @Title getOperatorData
+      * @param operatorData 
+     * @author rq
+     * @date 2022/7/15 17:38 
+     * @return OperatorData
+     * @throw
+     */
+    List<OperatorData> getOperatorData(OperatorData operatorData);
+
+
+    /**
+     * @Description 技能矩阵专用！！！
+     * @Title getWorkCenterData
+      * @param inData 
+     * @author rq
+     * @date 2022/7/19 16:24
+     * @return List<WorkCenterData>
+     * @throw
+     */
+    List<WorkCenterData> getWorkCenterData(WorkCenterData inData);
+
+    /**
+     * @Description 技能矩阵专用！！！
+     * @Title getWorkCenterOperatorData
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 16:20
+     * @return List<WorkCenterData>
+     * @throw
+     */
+    List<WorkCenterData> getWorkCenterOperatorData(WorkCenterData inData);
+
+    /**
+     * @Description 添加技能
+     * @Title addSkill
+      * @param inData
+     * @author rq
+     * @date 2022/7/19 17:14
+     * @return void
+     * @throw
+     */
+    void addSkill(WorkCenterData inData);
+
+    /**
+     * @Description 删除技能
+     * @Title deleteSkill
+     * @param inData
+     * @author rq
+     * @date 2022/7/19 17:14
+     * @return void
+     * @throw
+     */
+    void deleteSkill(WorkCenterData inData);
+
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+      * @param  
+     * @author rq
+     * @date 2022/7/21 17:03 
+     * @return List<ShopOrderRoutingData>
+     * @throw
+     */
+    List<ShopOrderRoutingData> getShopOrderRoutingData(ShopOrderRoutingData inData);
+    /**
+     * @Description TODO
+     * @Title getShopOrderRoutingData
+     * @param
+     * @author rq
+     * @date 2022/7/21 17:03
+     * @return List<ShopOrderRoutingData>
+     * @throw
+     */
+    List<ShopOrderRoutingData> getSOTastRoutingData(ShopOrderRoutingData inData);
+
+
 }

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -452,4 +452,46 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             return new ShopOrderData();
         }
     }
+
+
+    @Override
+    public  List<OperatorData> getOperatorData(OperatorData operatorData) {
+
+        return dailyPlanMapper.getOperatorData(operatorData);
+    }
+
+    @Override
+    public  List<WorkCenterData> getWorkCenterData(WorkCenterData inData){
+        return dailyPlanMapper.getWorkCenterData(inData);
+    }
+
+
+    @Override
+    public  List<WorkCenterData> getWorkCenterOperatorData(WorkCenterData inData){
+        return dailyPlanMapper.getWorkCenterOperatorData(inData);
+    }
+
+    @Override
+    public void addSkill(WorkCenterData inData){
+        List<WorkCenterData> checkList=dailyPlanMapper.checkWorkCenterOperatorData(inData);
+        if(checkList.size()==0){
+            dailyPlanMapper.addSkill(inData);
+        }
+    }
+
+    @Override
+    public void deleteSkill(WorkCenterData inData){
+        dailyPlanMapper.deleteSkill(inData);
+    }
+
+    @Override
+    public List<ShopOrderRoutingData> getShopOrderRoutingData(ShopOrderRoutingData inData){
+        return dailyPlanMapper.getShopOrderRoutingData(inData);
+    }
+
+    @Override
+    public List<ShopOrderRoutingData> getSOTastRoutingData(ShopOrderRoutingData inData){
+        return dailyPlanMapper.getSOTastRoutingData(inData);
+    }
+
 }

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -96,4 +96,142 @@
             </if>
         </where>
     </select>
+
+    <select id="getOperatorData" resultType="com.heai.modules.production.entity.OperatorData" >
+        select Site,OperatorID,OperatorName,Active,Department,CreatedDate,Passwords,LineLeader
+        from Operator
+            <where>
+            <if test="site != null and site != ''">
+                and Site = #{site}
+            </if>
+            <if test="operatorID != null and operatorID != ''">
+                and OperatorID like '%' + #{operatorID,jdbcType=VARCHAR} + '%'
+            </if>
+              <if test="operatorName != null and operatorName != ''">
+                and OperatorName like '%' + #{operatorName} + '%'
+            </if>
+              <if test="active != null and active != ''">
+                and Active = #{active}
+            </if>
+        </where>
+        order by CreatedDate
+    </select>
+
+    <select id="getWorkCenterData" resultType="WorkCenterData">
+        select a.Site,a.WorkCenterNo,a.WorkCenterDesc,a.Active FROM WorkCenter a left join
+        operator_work_center b on a.Site=b.Site and a.WorkCenterNo=b.WorkCenterNo and b.OperatorID=#{operatorID}
+        where a.site=#{site} and b.WorkCenterNo is null
+         order by a.WorkCenterNo
+    </select>
+    <select id="getWorkCenterOperatorData" resultType="WorkCenterData">
+        select a.Site,a.WorkCenterNo,b.WorkCenterDesc,b.Active FROM operator_work_center a left join
+        WorkCenter b on a.Site=b.Site and a.WorkCenterNo=b.WorkCenterNo
+        where a.site=#{site} and a.OperatorID=#{operatorID}
+        order by a.WorkCenterNo
+    </select>
+
+    <insert id="addSkill">
+        insert into operator_work_center(OperatorID,WorkCenterNo,created_by,created_date,Site)
+        values(#{operatorID},#{workCenterNo},#{user},GetDate(),#{site})
+    </insert>
+
+    <delete id="deleteSkill">
+        delete from operator_work_center where OperatorID=#{operatorID} and Site=#{site} and WorkCenterNo=#{workCenterNo}
+    </delete>
+
+    <select id="checkWorkCenterOperatorData" resultType="WorkCenterData">
+        select site FROM operator_work_center where OperatorID=#{operatorID} and Site=#{site} and WorkCenterNo=#{workCenterNo}
+    </select>
+
+    <select id="getShopOrderRoutingData" resultType="ShopOrderRoutingData">
+        select top 10000  a.site, a.OrderNo,a.PartNo,a.Status,a.PlanStartDate,a.NeedDate,a.LotSize,a.EnterDate,a.UserName,
+        P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc
+        FROM ShopOrder a
+        LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
+        LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.orderNo
+        LEFT JOIN ScheduleList SL on S.site=SL.site and S.OrderNo=SL.orderNo and S.ItemNo=SL.ItemNo
+         <where>
+           a.OrderNo not like '~1' and a.OrderNo not like '~2'
+           <if test="site != null and site != ''">
+                AND a.site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND a.OrderNo LIKE  #{orderNo}
+            </if>
+            <if test="status !=null and status != ''">
+                AND a.Status IN ${status}
+            </if>
+            <if test="startDate1 != null ">
+                AND a.EnterDate >=   #{startDate1}
+            </if>
+            <if test="endDate1 != null ">
+                AND  #{endDate1} >=  DATEADD(dd, -1, a.EnterDate)
+            </if>
+            <if test="startDate2 != null ">
+                AND a.PlanStartDate >=   #{startDate2}
+            </if>
+            <if test="endDate2 != null ">
+                AND  #{endDate2} >=  a.PlanStartDate
+            </if>
+            <if test="startDate3 != null ">
+                AND a.NeedDate >=   #{startDate3}
+            </if>
+            <if test="endDate3 != null ">
+                AND  #{endDate3} >=  a.NeedDate
+            </if>
+            <if test="partNo != null and partNo != ''">
+                AND a.PartNo LIKE  #{partNo}
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                and ${planStatus}
+            </if>
+            <if test="itemNo != null and itemNo != ''">
+                and S.ItemNo = #{itemNo}
+            </if>
+        </where>
+        order by a.PlanStartDate desc,s.itemNo
+    </select>
+
+
+     <select id="getSOTastRoutingData" resultType="ShopOrderRoutingData">
+        select top 10000  a.site, a.OrderNo,a.PartNo,a.Status,a.OrderRef1,a.OrderDate,a.OrderQty as LotSize,
+        P.PartDescription,P.Spec,isnull(SL.scheduledQty,0) as scheduledQty,s.workCenterNo,S.qtyReported,S.qtyApprove,S.machSetupTime,
+        S.machRunFactor,S.factorUnit,S.ItemNo,S.OperationDesc
+        FROM SOTaskOrderHeader a
+        LEFT JOIN Part P ON P.PartNo=a.PartNo AND a.site=P.Site
+        LEFT JOIN SORouting S on S.site=a.site and S.OrderNo=a.OrderRef1
+        LEFT JOIN ScheduleList SL on S.site=SL.site and S.OrderNo=SL.orderNo and S.ItemNo=SL.ItemNo
+         <where>
+
+           <if test="site != null and site != ''">
+                AND a.site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND a.OrderNo LIKE  #{orderNo}
+            </if>
+            <if test="status !=null and status != ''">
+                AND a.Status IN ${status}
+            </if>
+            <if test="startDate1 != null ">
+                AND a.orderDate >=   #{startDate1}
+            </if>
+            <if test="endDate1 != null ">
+                AND  #{endDate1} >=   a.orderDate
+            </if>
+             <if test="orderRef1 != null and orderRef1 != ''">
+                AND a.OrderRef1 LIKE  #{orderRef1}
+            </if>
+            <if test="partNo != null and partNo != ''">
+                AND a.PartNo LIKE  #{partNo}
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                and ${planStatus}
+            </if>
+            <if test="itemNo != null and itemNo != ''">
+                and S.ItemNo = #{itemNo}
+            </if>
+        </where>
+        order by a.OrderDate desc,s.itemNo
+    </select>
 </mapper>