diff --git a/src/api/production.js b/src/api/production.js
index 9fbd3d3..9521582 100644
--- a/src/api/production.js
+++ b/src/api/production.js
@@ -17,3 +17,17 @@ export const deleteSkill=data => createAPI(`schedule/deleteSkill`, 'post', data)
export const getAllDepartment= data => createAPI(`schedule/getAllDepartment`, 'post', data);
export const updateTV=data => createAPI(`schedule/updateTV`, 'post', data);
+export const getShopOrderData= data => createAPI(`dailyPlan/getShopOrderData`, 'post', data);
+export const getSchedulingSize= data => createAPI(`dailyPlan/getSchedulingSize`, 'post', data);
+export const savePlan= data => createAPI(`dailyPlan/savePlan`, 'post', data);
+export const getWorkPlanData= data => createAPI(`dailyPlan/getWorkPlanData`, 'post', data);
+export const delPlan= data => createAPI(`dailyPlan/delPlan`, 'post', data);
+export const savePlans= data => createAPI(`dailyPlan/savePlans`, 'post', data);
+export const getDailyPlanData= data => createAPI(`dailyPlan/getDailyPlanData`, 'post', data);
+
+export const getSOTastRoutingData= data => createAPI(`dailyPlan/getSOTastRoutingData`, 'post', data);
+export const getWorkCenterOperatorList= data => createAPI(`dailyPlan/getWorkCenterOperatorList`, 'post', data);
+export const getAvailableResourceList= data => createAPI(`dailyPlan/getAvailableResourceList`, 'post', data);
+export const scheduleForSOTask= data => createAPI(`dailyPlan/scheduleForSOTask`, 'post', data);
+export const getDailyPlanRouteDetailData= data => createAPI(`dailyPlan/getDailyPlanRouteDetailData`, 'post', data);
+export const getDailyPlanScheduleDetailData= data => createAPI(`dailyPlan/getDailyPlanScheduleDetailData`, 'post', data);
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
new file mode 100644
index 0000000..e7bd946
--- /dev/null
+++ b/src/views/modules/production/dailyPlan.vue
@@ -0,0 +1,796 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+ 物料编码
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 批量新增
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 取消
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存并继续
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue
new file mode 100644
index 0000000..fd0cdfc
--- /dev/null
+++ b/src/views/modules/production/searchDailyPlan.vue
@@ -0,0 +1,441 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+
+ 工序明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 明细
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/schedule/generateReport.vue b/src/views/modules/schedule/generateReport.vue
index 99fc37e..a62f708 100644
--- a/src/views/modules/schedule/generateReport.vue
+++ b/src/views/modules/schedule/generateReport.vue
@@ -285,8 +285,11 @@
-
-
+
+
+
+
+
@@ -464,6 +467,7 @@
userId:'',
},
scanSeqNo:'',
+ previousSeqNo:'',
stopModalFlag:false,
continueModalFlag:false,
qty1:'',
@@ -683,9 +687,13 @@
},
openStart(){
this.scanSeqNo='';
+ this.previousSeqNo='';
this.startModalFlag=true;
this.$nextTick(() => { this.$refs.start.focus();})
},
+ nextSeqNo(){
+ this.$nextTick(() => { this.$refs.last.focus();})
+ },
searchSeqNo(){
if(this.scanSeqNo==''){
this.$alert("请扫描派工单!",'错误', {
@@ -779,6 +787,7 @@
let inData={
username:this.$store.state.user.name,
seqNo:this.scanSeqNo,
+ previousSeqNo:this.previousSeqNo,
}
startSeqNo(inData).then(({data}) => {
if (data && data.code === 0) {
diff --git a/src/views/modules/schedule/scheduleForSOTask.vue b/src/views/modules/schedule/scheduleForSOTask.vue
new file mode 100644
index 0000000..fa0727b
--- /dev/null
+++ b/src/views/modules/schedule/scheduleForSOTask.vue
@@ -0,0 +1,808 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料编码
+
+
+
+
+
+
+
+
+
+
+ 加工中心
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+
+
+ 派工
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+