From 6d51af4d82956e1194deb52d1427190ecbaa0a81 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 三月 2022 14:41:47 +0800
Subject: [PATCH] #杰克缝纫机立库 【根据单号检索单据数据】
---
src/main/resources/mapper/OrderDetlMapper.xml | 7 +
/dev/null | 294 -------------------------------------------------
src/main/java/com/zy/asrs/service/OrderService.java | 2
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 10 +
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 4
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 3
src/main/java/com/zy/asrs/controller/MobileController.java | 2
7 files changed, 23 insertions(+), 299 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bd21a57..b14651c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -52,7 +52,7 @@
if (order.getSettle() > 2) {
return R.ok();
}
- List<OrderDetl> orderDetls = orderService.selectWorkingDetls(orderNo);
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
if (Cools.isEmpty(orderDetls)) {
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index bf62eff..1090d1f 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -6,10 +6,14 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ List<OrderDetl> selectWorkingDetls(Long orderId);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 21bfca7..1f4bdcf 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -2,9 +2,12 @@
import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Mapper
@Repository
public interface OrderMapper extends BaseMapper<Order> {
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index b2c15f9..f440fd4 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -10,6 +10,6 @@
Order selectByNo(String orderNo);
- List<OrderDetl> selectWorkingDetls(String orderNo);
+ List<OrderDetl> selectWorkingDetls(Long orderId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index c3d1327..5ec4c8e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -3,16 +3,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+
+ @Autowired
+ private OrderDetlMapper orderDetlMapper;
@Override
public Order selectByNo(String orderNo) {
@@ -24,9 +29,8 @@
}
@Override
- public List<OrderDetl> selectWorkingDetls(String orderNo) {
-
- return null;
+ public List<OrderDetl> selectWorkingDetls(Long orderId) {
+ return orderDetlMapper.selectWorkingDetls(orderId);
}
}
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index beef24a..1dc2613 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -40,4 +40,11 @@
</if>
</select>
+ <select id="selectWorkingDetls" resultMap="BaseResultMap">
+ select * from man_order_detl
+ where 1=1
+ and order_id = #{orderId}
+ and qty < anfme
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/order0.js b/src/main/webapp/static/js/order/order0.js
deleted file mode 100644
index 40a8a13..0000000
--- a/src/main/webapp/static/js/order/order0.js
+++ /dev/null
@@ -1,294 +0,0 @@
-var pageCurr;
-layui.config({
- base: baseUrl + "/static/layui/lay/modules/"
-}).use(['table','laydate', 'form', 'admin'], function(){
- var table = layui.table;
- var $ = layui.jquery;
- var layer = layui.layer;
- var layDate = layui.laydate;
- var form = layui.form;
- var admin = layui.admin;
-
- // 鏁版嵁娓叉煋
- tableIns = table.render({
- elem: '#order',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/order/list/auth',
- page: true,
- limit: 15,
- limits: [15, 30, 50, 100, 200, 500],
- toolbar: '#toolbar',
- cellMinWidth: 50,
- height: 'full-120',
- cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID'}
- ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- ,{field: 'orderNo', align: 'center',title: '璁㈠崟缂栧彿'}
- ,{field: 'orderTime', align: 'center',title: '鍗曟嵁鏃ユ湡'}
- ,{field: 'docType$', align: 'center',title: '鍗曟嵁绫诲瀷'}
- ,{field: 'itemId$', align: 'center',title: '椤圭洰缂栧彿'}
- ,{field: 'itemName', align: 'center',title: ''}
- ,{field: 'allotItemId$', align: 'center',title: '璋冩嫧椤圭洰缂栧彿'}
- ,{field: 'defNumber', align: 'center',title: '鍒濆绁ㄦ嵁鍙�'}
- ,{field: 'number', align: 'center',title: '绁ㄦ嵁鍙�'}
- ,{field: 'cstmr$', align: 'center',title: '瀹㈡埛缂栧彿'}
- ,{field: 'cstmrName', align: 'center',title: '瀹㈡埛'}
- ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'}
- ,{field: 'operMemb', align: 'center',title: '鎿嶄綔浜哄憳'}
- ,{field: 'totalFee', align: 'center',title: '鍚堣閲戦'}
- ,{field: 'discount', align: 'center',title: '浼樻儬鐜�'}
- ,{field: 'discountFee', align: 'center',title: '浼樻儬閲戦'}
- ,{field: 'otherFee', align: 'center',title: '閿�鍞垨閲囪喘璐圭敤鍚堣'}
- ,{field: 'actFee', align: 'center',title: '瀹炰粯閲戦'}
- ,{field: 'payType$', align: 'center',title: '浠樻绫诲瀷'}
- ,{field: 'salesman', align: 'center',title: '涓氬姟鍛�'}
- ,{field: 'accountDay', align: 'center',title: '缁撶畻澶╂暟'}
- ,{field: 'postFeeType$', align: 'center',title: '閭垂鏀粯绫诲瀷'}
- ,{field: 'postFee', align: 'center',title: '閭垂'}
- ,{field: 'payTime$', align: 'center',title: '浠樻鏃堕棿'}
- ,{field: 'sendTime$', align: 'center',title: '鍙戣揣鏃堕棿'}
- ,{field: 'shipName', align: 'center',title: '鐗╂祦鍚嶇О'}
- ,{field: 'shipCode', align: 'center',title: '鐗╂祦鍗曞彿'}
- ,{field: 'settle$', align: 'center',title: '璁㈠崟鐘舵��'}
- ,{field: 'status$', align: 'center',title: '鐘舵��'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
-
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
- ]],
- request: {
- pageName: 'curr',
- pageSize: 'limit'
- },
- parseData: function (res) {
- return {
- 'code': res.code,
- 'msg': res.msg,
- 'count': res.data.total,
- 'data': res.data.records
- }
- },
- response: {
- statusCode: 200
- },
- done: function(res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- limit();
- }
- });
-
- // 鐩戝惉鎺掑簭浜嬩欢
- table.on('sort(order)', function (obj) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- searchData['orderByField'] = obj.field;
- searchData['orderByType'] = obj.type;
- tableIns.reload({
- where: searchData,
- page: {curr: 1}
- });
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(order)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id).data;
- switch(obj.event) {
- case 'addData':
- showEditModel();
- break;
- case 'deleteData':
- if (checkStatus.length === 0) {
- layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
- return;
- }
- del(checkStatus.map(function (d) {
- return d.id;
- }));
- break;
- case 'exportData':
- admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
- var titles=[];
- var fields=[];
- obj.config.cols[0].map(function (col) {
- if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
- titles.push(col.title);
- fields.push(col.field);
- }
- });
- var exportData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- exportData[this.name] = this.value;
- });
- var param = {
- 'order': exportData,
- 'fields': fields
- };
- $.ajax({
- url: baseUrl+"/order/export/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify(param),
- dataType:'json',
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll();
- if (res.code === 200) {
- table.exportFile(titles,res.data,'xls');
- } else if (res.code === 403) {
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- });
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(order)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'edit':
- showEditModel(data);
- break;
- case "del":
- del([data.id]);
- break;
- }
- });
-
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
- admin.open({
- type: 1,
- area: '600px',
- title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
- content: $('#editDialog').html(),
- success: function (layero, dIndex) {
- layDateRender(mData);
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/order/"+(mData?'update':'add')+"/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.close(dIndex);
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
-
- /* 鍒犻櫎 */
- function del(ids) {
- layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
- skin: 'layui-layer-admin',
- shade: .1
- }, function (i) {
- layer.close(i);
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/order/delete/auth",
- headers: {'token': localStorage.getItem('token')},
- data: {ids: ids},
- method: 'POST',
- success: function (res) {
- layer.close(loadIndex);
- if (res.code === 200){
- layer.msg(res.msg, {icon: 1});
- tableReload();
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- });
- }
-
- // 鎼滅储
- form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload(false);
- });
-
- // 閲嶇疆
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
- tableReload(false);
- });
-
- // 鏃堕棿閫夋嫨鍣�
- function layDateRender(data) {
- setTimeout(function () {
- layDate.render({
- elem: '#payTime\\$',
- type: 'datetime',
- value: data!==undefined?data['payTime\\$']:null
- });
- layDate.render({
- elem: '#sendTime\\$',
- type: 'datetime',
- value: data!==undefined?data['sendTime\\$']:null
- });
- layDate.render({
- elem: '#createTime\\$',
- type: 'datetime',
- value: data!==undefined?data['createTime\\$']:null
- });
- layDate.render({
- elem: '#updateTime\\$',
- type: 'datetime',
- value: data!==undefined?data['updateTime\\$']:null
- });
-
- }, 300);
- }
- layDateRender();
-
-});
-
-// 鍏抽棴鍔ㄤ綔
-$(document).on('click','#data-detail-close', function () {
- parent.layer.closeAll();
-});
-
-function tableReload(child) {
- var searchData = {};
- $.each($('#search-box [name]').serializeArray(), function() {
- searchData[this.name] = this.value;
- });
- tableIns.reload({
- where: searchData,
- page: {curr: pageCurr}
- });
-}
--
Gitblit v1.9.1