From be554d9e52799a0ee14c98b0959d07ab3847c8e6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 15:24:27 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/entity/HalfBarcode.java | 27 +
src/main/webapp/static/js/halfBarcode/halfBarcode.js | 534 +++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/HalfBarcodeController.java | 58 +++
src/main/java/com/zy/asrs/service/MatBarcodeService.java | 3
src/main/java/com/zy/asrs/service/HalfBarcodeService.java | 10
src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java | 52 +++
src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java | 2
src/main/webapp/views/halfBarcode/halfBarcode.html | 71 ++++
src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java | 23 +
src/main/resources/mapper/HalfBarcodeMapper.xml | 25 +
src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js | 2
src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java | 16 +
src/main/webapp/static/js/common.js | 41 ++
13 files changed, 862 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java b/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
new file mode 100644
index 0000000..56f332f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/HalfBarcodeController.java
@@ -0,0 +1,58 @@
+package com.zy.asrs.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.HalfBarcode;
+import com.zy.asrs.entity.MatBarcode;
+import com.zy.asrs.service.HalfBarcodeService;
+import com.zy.asrs.service.MatBarcodeService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping
+public class HalfBarcodeController extends BaseController {
+ @Autowired
+ private HalfBarcodeService halfBarcodeService;
+ /*
+ * 鐗╂枡鎵樼洏缁戝畾鍒嗛〉鏌ヨ
+ * */
+ @RequestMapping(value = "/halfBarcode/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param) {
+ excludeTrash(param);
+ EntityWrapper<HalfBarcode> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ else {
+ wrapper.orderBy("modi_time", false);
+ }
+ return R.ok(halfBarcodeService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+}
diff --git a/src/main/java/com/zy/asrs/entity/HalfBarcode.java b/src/main/java/com/zy/asrs/entity/HalfBarcode.java
new file mode 100644
index 0000000..a8ef1fd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/HalfBarcode.java
@@ -0,0 +1,27 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("cust_half_barcode")
+public class HalfBarcode {
+ private static final long serialVersionUID = 1L;
+ @TableField("zpallet")
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ private String zpallet;
+
+ @ApiModelProperty(value= "缁戝畾鏁伴噺")
+ @TableField("anfme")
+ private int anfme;
+
+ @ApiModelProperty(value= "鍙斁鏁伴噺")
+ @TableField("price")
+ private int price;
+
+ @ApiModelProperty(value= "鎵樼洏瑙勬牸")
+ @TableField("specs")
+ private String specs;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java b/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java
new file mode 100644
index 0000000..3580d23
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/HalfBarcodeMapper.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.HalfBarcode;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@Repository
+public interface HalfBarcodeMapper extends BaseMapper<HalfBarcode> {
+ @Select("select top 1 * from cust_half_barcode where zpallet=#{zpallet}")
+ HalfBarcode selectByZpallet(String zpallet);
+
+ boolean half(HalfBarcode halfBarcode);
+}
diff --git a/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java b/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java
index c7ffc5c..2bb0d6b 100644
--- a/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatBarcodeMapper.java
@@ -14,4 +14,6 @@
@Delete("delete from cust_matnr_barcode where matnr=#{matnr}")
void deleteByMatnr(String matnr);
+
+ String page(Integer pageNo, Integer pageSize, String barcode, Integer spec);
}
diff --git a/src/main/java/com/zy/asrs/service/HalfBarcodeService.java b/src/main/java/com/zy/asrs/service/HalfBarcodeService.java
new file mode 100644
index 0000000..6f32752
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/HalfBarcodeService.java
@@ -0,0 +1,10 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.HalfBarcode;
+
+public interface HalfBarcodeService extends IService<HalfBarcode> {
+ HalfBarcode selectByZpallet(String zpallet);
+
+ boolean half(HalfBarcode halfBarcode);
+}
diff --git a/src/main/java/com/zy/asrs/service/MatBarcodeService.java b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
index 1cdca7d..fa826b5 100644
--- a/src/main/java/com/zy/asrs/service/MatBarcodeService.java
+++ b/src/main/java/com/zy/asrs/service/MatBarcodeService.java
@@ -7,6 +7,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
@Service
public interface MatBarcodeService extends IService<MatBarcode> {
@@ -17,4 +18,6 @@
void addBarcodeMatnr(WaitPakin waitPakin);
void addBarcodeMatnrTwo(Mat mat);
+
+ String page(Map<String, Object> param);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java
new file mode 100644
index 0000000..96ab1c3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/HalfBarcodeServiceImpl.java
@@ -0,0 +1,23 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.HalfBarcode;
+import com.zy.asrs.mapper.HalfBarcodeMapper;
+import com.zy.asrs.service.HalfBarcodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("HalfBarcodeService")
+public class HalfBarcodeServiceImpl extends ServiceImpl<HalfBarcodeMapper, HalfBarcode> implements HalfBarcodeService {
+ @Autowired
+ private HalfBarcodeMapper halfBarcodeMapper;
+ @Override
+ public HalfBarcode selectByZpallet(String zpallet) {
+ return halfBarcodeMapper.selectByZpallet(zpallet);
+ }
+
+ @Override
+ public boolean half(HalfBarcode halfBarcode) {
+ return halfBarcodeMapper.half(halfBarcode);
+ }
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
index 8040092..721ccff 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatBarcodeServiceImpl.java
@@ -2,17 +2,19 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.HalfBarcode;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatBarcode;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.mapper.MatBarcodeMapper;
+import com.zy.asrs.service.HalfBarcodeService;
import com.zy.asrs.service.MatBarcodeService;
import com.zy.asrs.service.MatService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
@Service("MatBarcodeService")
public class MatBarcodeServiceImpl extends ServiceImpl<MatBarcodeMapper, MatBarcode> implements MatBarcodeService {
@@ -22,6 +24,8 @@
private MatBarcodeService matBarcodeService;
@Autowired
private MatService matService;
+ @Autowired
+ private HalfBarcodeService halfBarcodeService;
@Override
public MatBarcode selectbyMatnr(String matnr) {
return this.baseMapper.selectByMatnr(matnr);
@@ -30,6 +34,12 @@
@Override
public void deleteMatBarcode(List<MatBarcode> list) {
for (MatBarcode matBarcode : list) {
+ HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(matBarcode.getZpallet());
+ halfBarcode.setAnfme(halfBarcode.getAnfme() - 1);
+ halfBarcode.setPrice(halfBarcode.getPrice() + 1);
+ if (!halfBarcodeService.half(halfBarcode)){
+ throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
+ }
matBarcodeMapper.deleteByMatnr(matBarcode.getMatnr());
}
}
@@ -46,6 +56,37 @@
}
if (mat.getColor().equals("鎶ュ簾")){
throw new CoolException("璇ョ墿鏂欏凡鎶ュ簾锛岃鍕跨粦瀹�");
+ }
+ HalfBarcode halfBarcode = halfBarcodeService.selectByZpallet(waitPakin.getBarcode());
+ if (halfBarcode == null){
+ HalfBarcode hb = new HalfBarcode();
+ hb.setZpallet(waitPakin.getBarcode());
+ hb.setSpecs(waitPakin.getBarcode().substring(0,1));
+ hb.setAnfme(1);
+ if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
+ hb.setPrice(24-1);
+ }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
+ hb.setPrice(24-1);
+ }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
+ hb.setPrice(24-1);
+ }
+ if (!halfBarcodeService.insert(hb)){
+ throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
+ }
+ }else {
+ if (Integer.parseInt(waitPakin.getBarcode().substring(0,1))==6){
+ halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
+ halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==7){
+ halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
+ halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ }else if(Integer.parseInt(waitPakin.getBarcode().substring(0,1))==8){
+ halfBarcode.setAnfme(halfBarcode.getAnfme() + 1);
+ halfBarcode.setPrice(halfBarcode.getPrice()-1);
+ }
+ if (!halfBarcodeService.half(halfBarcode)){
+ throw new CoolException("鏇存柊鍗婃墭淇℃伅澶辫触");
+ }
}
MatBarcode mb=new MatBarcode();
mb.setZpallet(waitPakin.getBarcode());
@@ -81,4 +122,13 @@
throw new CoolException("鐗╂枡鎵樼洏缁戝畾澶辫触");
}
}
+
+ @Override
+ public String page(Map<String, Object> param) {
+ Integer pageNo = Integer.valueOf(param.get("curr").toString());
+ Integer pageSize = Integer.valueOf(param.get("limit").toString());
+ String barcode = (String) param.get("zpallet");
+ Integer spec = Integer.valueOf(param.get("spec").toString());
+ return matBarcodeMapper.page(pageNo,pageSize,barcode,spec);
+ }
}
diff --git a/src/main/resources/mapper/HalfBarcodeMapper.xml b/src/main/resources/mapper/HalfBarcodeMapper.xml
new file mode 100644
index 0000000..a373715
--- /dev/null
+++ b/src/main/resources/mapper/HalfBarcodeMapper.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.HalfBarcodeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.HalfBarcode">
+ <result column="zpallet" property="zpallet"/>
+ <result column="anfme" property="anfme" />
+ <result column="price" property="price" />
+ <result column="specs" property="specs" />
+ </resultMap>
+
+ <update id="half" parameterType="com.zy.asrs.entity.HalfBarcode">
+ UPDATE cust_half_barcode
+ <set>
+ <if test="anfme != null">
+ anfme = #{anfme},
+ </if>
+ <if test="price != null">
+ price = #{price},
+ </if>
+ </set>
+ WHERE zpallet = #{zpallet}
+ </update>
+</mapper>
diff --git a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
index c05ee2a..b8471e1 100644
--- a/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
+++ b/src/main/webapp/static/js/barcodeMatnr/barcodeMatnr.js
@@ -37,7 +37,7 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/barcodeMatnr/list/auth',
page: true,
- limit: 16,
+ limit: 30,
limits: [16, 30, 50, 100, 200, 500],
even: true,
toolbar: '#toolbar',
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index dfbe9ac..366c78d 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -268,3 +268,44 @@
]
+var halfBarcodeCols = [
+ {field: 'matnr', align: 'center',title: '鍟嗗搧妯″叿鍚嶇О', sort:true, hide: true}
+ ,{field: 'model', align: 'center',title: '濂楀彿', hide: true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍨嬫潗鍨嬪彿', sort:true, hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', hide:true,sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵规', hide:true,sort:true}
+ ,{field: 'outOrderNo', align: 'center',title: '鍚堝悓鍙�', sort:true, hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
+ ,{field: 'anfme', align: 'center',title: '缁戝畾鏁伴噺', hide: false}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏉愯川', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鎬婚噸閲�', hide: true}
+ ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'price', align: 'center',title: '鍙斁鏁伴噺', hide:false }
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'proType', align: 'center',title: '灞炴��', hide: true}
+ ,{field: 'temp1', align: 'center',title: '鍚嶇О鎬荤О', hide: true}
+ ,{field: 'temp2', align: 'center',title: '瀹㈡埛鍥惧彿', hide: true}
+
+]
+
diff --git a/src/main/webapp/static/js/halfBarcode/halfBarcode.js b/src/main/webapp/static/js/halfBarcode/halfBarcode.js
new file mode 100644
index 0000000..35b57cd
--- /dev/null
+++ b/src/main/webapp/static/js/halfBarcode/halfBarcode.js
@@ -0,0 +1,534 @@
+var pageCurr;
+function getCol() {
+ var cols = [ {type: 'checkbox'} ];
+ cols.push.apply(cols, halfBarcodeCols);
+ cols.push(
+ // {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ // ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
+ // var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.status === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }, hide: true}
+ // ,{field: 'ioStatus', align: 'center',title: '鍏ュ嚭鐘舵��', templet:function(row){
+ // var html = "<input value='ioStatus' type='checkbox' lay-skin='switch' lay-text='鍏ュ簱涓瓅寰呭叆搴�' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
+ // if(row.ioStatus === 'Y'){html += " checked ";}
+ // html += ">";
+ // return html;
+ // }}
+ {field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true},
+ {field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ return cols;
+}
+
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'tableMerge'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var tableMerge = layui.tableMerge;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#waitPakin',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/halfBarcode/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ 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) {
+ // tableMerge.render(this);
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locMast)', 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
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(waitPakin)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'addWrk':
+ if (checkStatus.data.length === 0){
+ layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
+ } else {
+ layer.confirm('纭畾璇ョ墿鏂欎笌鎵樼洏瑙ｇ粦鍚�', function(){
+ $.ajax({
+ url: baseUrl+"/barcodeMatnr/matnrLostBarcode",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(checkStatus.data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'addData':
+ layer.open({
+ type: 2,
+ title: '缁戝畾',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'barcodeMatnr_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ // case 'deleteData':
+ // layer.open({
+ // type: 2,
+ // title: '缁勬墭',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // content: 'barcodeMatnr_comb.html',
+ // success: function(layero, index){
+ // layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ // clearFormVal(layer.getChildFrame('#detail', index));
+ // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // }
+ // });
+ // break;
+ case 'deleteData':
+ if (checkStatus.data.length === 0){
+ layer.msg('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�', {icon: 2});
+ } else {
+ layer.confirm('纭畾缁勬墭鍚�', function(){
+ $.ajax({
+ url: baseUrl+"/barcodeMatnr/matnrAndBarcode",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(checkStatus.data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ layer.msg(res.msg, {icon: 1})
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ });
+ }
+ break;
+ case 'clampData':
+ layer.open({
+ type: 2,
+ title: '骞舵澘',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'barcodeMatnr_clamp.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-edit', index).hide();
+ clearFormVal(layer.getChildFrame('#detail', index));
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ }
+ });
+ break;
+ case 'exportData':
+ layer.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 = {
+ 'waitPakin': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/waitPakin/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)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(waitPakin)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: 'waitPakin_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ // 缂栬緫
+ case 'edit':
+ layer.open({
+ type: 2,
+ title: '淇敼',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ content: 'waitPakin_detail.html',
+ success: function(layero, index){
+ layer.getChildFrame('#data-detail-submit-save', index).hide();
+ setFormVal(layer.getChildFrame('#detail', index), data, false);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), false);
+ top.convertDisabled(layer.getChildFrame('#id', index), true);
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+ case 'modiUser':
+ var param = top.reObject(data).modiUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '淇敼浜哄憳璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+ case 'appeUser':
+ var param = top.reObject(data).appeUser;
+ if (param === undefined) {
+ layer.msg("鏃犳暟鎹�");
+ } else {
+ layer.open({
+ type: 2,
+ title: '鍒涘缓鑰呰鎯�',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: true,
+ content: '../user/user_detail.html',
+ success: function(layero, index){
+ $.ajax({
+ url: "baseUrl+/user/"+ param +"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200){
+ setFormVal(layer.getChildFrame('#detail', index), res.data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ }
+ });
+ }
+ break;
+
+ }
+ });
+
+ // 鏁版嵁淇濆瓨鍔ㄤ綔
+ form.on('submit(save)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add");
+ });
+
+ form.on('submit(save1)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add1");
+ });
+
+ form.on('submit(save2)', function () {
+ if (banMsg != null){
+ layer.msg(banMsg);
+ return;
+ }
+ method("add2");
+ });
+
+ // 鏁版嵁淇敼鍔ㄤ綔
+ form.on('submit(edit)', function () {
+ method("update")
+ });
+
+ function method(name){
+ var index = layer.load(1, {
+ shade: [0.5,'#000'] //0.1閫忔槑搴︾殑鑳屾櫙
+ });
+ var data = {
+// id: $('#id').val(),
+ id: $('#id').val(),
+ barcode: $('#barcode').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ anfme: $('#anfme').val(),
+ unit: $('#unit').val(),
+ status: $('#status').val(),
+ memo: $('#memo').val(),
+ modiTime: top.strToDate($('#modiTime\\$').val()),
+ modiUser: $('#modiUser').val(),
+ appeTime: top.strToDate($('#appeTime\\$').val()),
+ appeUser: $('#appeUser').val(),
+
+ };
+ $.ajax({
+ url: baseUrl+"/barcodeMatnr/"+name+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: top.reObject(data),
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.layer.closeAll();
+ parent.$(".layui-laypage-btn")[0].click();
+ $("#data-detail :input").each(function () {
+ $(this).val("");
+ });
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg)
+ }
+ layer.close(index);
+ }
+ })
+ }
+
+ // 澶嶉�夋浜嬩欢
+ form.on('checkbox(detailCheckbox)', function (data) {
+ var el = data.elem;
+ if (el.checked) {
+ $(el).val('Y');
+ } else {
+ $(el).val('N');
+ }
+ });
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function setFormVal(el, data, showImg) {
+ for (var val in data) {
+ var find = el.find(":input[id='" + val + "']");
+ if (find[0]!=null){
+ if (find[0].type === 'checkbox'){
+ if (data[val]==='Y'){
+ find.attr("checked","checked");
+ find.val('Y');
+ } else {
+ find.remove("checked");
+ find.val('N');
+ }
+ continue;
+ }
+ }
+ find.val(data[val]);
+ if (showImg){
+ var next = find.next();
+ if (next.get(0)){
+ if (next.get(0).localName === "img") {
+ find.hide();
+ next.attr("src", data[val]);
+ next.show();
+ }
+ }
+ }
+ }
+};
\ No newline at end of file
diff --git a/src/main/webapp/views/halfBarcode/halfBarcode.html b/src/main/webapp/views/halfBarcode/halfBarcode.html
new file mode 100644
index 0000000..fadc617
--- /dev/null
+++ b/src/main/webapp/views/halfBarcode/halfBarcode.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鏉＄爜" autocomplete="off">
+ </div>
+ </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧妯″叿鍚嶇О" autocomplete="off">-->
+<!-- </div>-->
+<!-- </div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="specs" placeholder="鎵樼洏瑙勬牸" autocomplete="off">
+ </div>
+ </div>
+ <!-- 鏃ユ湡鑼冨洿 -->
+ <!-- <div class="layui-inline" style="width: 300px">-->
+ <!-- <div class="layui-input-inline">-->
+ <!-- <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="waitPakin" lay-filter="waitPakin"></table>
+</div>
+<!--<script type="text/html" id="toolbar">-->
+<!-- <div class="layui-btn-container">-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-wrk" lay-event="addWrk">瑙ｇ粦</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">缁戝畾</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">缁勬墭</button>-->
+<!-- <button class="layui-btn layui-btn-sm" id="btn-clamp" lay-event="clampData">骞舵澘</button>-->
+<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="">瀵煎嚭</button>-->
+<!-- </div>-->
+<!--</script>-->
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/halfBarcode/halfBarcode.js" charset="utf-8"></script>
+<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1