src/main/java/com/zy/asrs/controller/LocNormalController.java
@@ -1,6 +1,7 @@ package com.zy.asrs.controller; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; @@ -12,10 +13,13 @@ import com.core.common.R; import com.sun.org.apache.bcel.internal.generic.NEW; import com.zy.asrs.entity.LocNormal; import com.zy.asrs.entity.LocNormalLog; import com.zy.asrs.entity.LocNormalReport; import com.zy.asrs.entity.param.LocNormalParam; import com.zy.asrs.service.LocNormalLogService; import com.zy.asrs.service.LocNormalReportService; import com.zy.asrs.service.LocNormalService; import com.zy.asrs.utils.VersionUtils; import com.zy.common.service.erp.ErpService; import com.zy.common.service.erp.ErpSqlServer; import com.zy.common.utils.excel.locNomal.LocNormalExcel; @@ -23,6 +27,7 @@ import com.zy.common.utils.excel.matcode.MatCodeExcel; import com.zy.common.utils.excel.matcode.MatCodeExcelListener; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; @@ -42,6 +47,7 @@ import static jdk.nashorn.api.scripting.ScriptUtils.convert; @Slf4j @RestController public class LocNormalController extends BaseController { @Autowired @@ -50,6 +56,8 @@ private LocNormalReportService locNormalReportService; @Autowired private ErpSqlServer erpSqlServer; @Autowired private LocNormalLogService locNormalLogService; @RequestMapping(value = "/locNomal/list/auth") @ManagerAuth @@ -127,6 +135,17 @@ ErpSql = MessageFormat.format(ErpSql, param.getMatnr(), erpCount); erpSqlServer.update(ErpSql); locNormalService.updateLocNormal(param.getMatnr(), param.getAnfme(), modiUser, modiTime, param.getId()); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, param); locLog.setAnfme(erpCount.doubleValue()); locLog.setIoType(3); // 修改 locLog.setCreateTime(new Date()); locLog.setCreateUser(modiUser); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓修改库存记录插入失败,数据:" + logStr); } } @RequestMapping(value = "/locNormal/outLoc/auth") @@ -257,15 +276,11 @@ @RequestParam(required = false) String condition, @RequestParam Map<String, Object> param) { excludeTrash(param); EntityWrapper<LocNormalReport> wrapper = new EntityWrapper<>(); List<String> orderList = new ArrayList<>(); orderList.add("time"); wrapper.eq("state", param.get("state").toString()).orderDesc(orderList); String timeRange = ""; EntityWrapper<LocNormalLog> wrapper = new EntityWrapper<>(); String time1 = ""; String time2 = ""; if (!Cools.isEmpty(param.get("query_date"))) { timeRange = param.get("query_date").toString(); String timeRange = param.get("query_date").toString(); time1 = timeRange.substring(0, 19); time2 = timeRange.substring(21, timeRange.length()); } @@ -281,9 +296,12 @@ } catch (Exception e) { e.printStackTrace(); } wrapper.ge("time", dateTime1).and().le("time", dateTime2); wrapper.ge("create_time", dateTime1).and().le("create_time", dateTime2); } allLike(LocNormalReport.class, param.keySet(), wrapper, condition); return R.ok(locNormalReportService.selectPage(new Page<>(curr, limit), wrapper)); List<String> oderCol = new ArrayList<>(); oderCol.add("create_time"); wrapper.orderDesc(oderCol); allLike(LocNormalLog.class, param.keySet(), wrapper, condition); return R.ok(locNormalLogService.selectPage(new Page<>(curr, limit), wrapper)); } } src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -1,5 +1,6 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.annotations.ManagerAuth; import com.core.common.Cools; @@ -8,11 +9,14 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.LocNormal; import com.zy.asrs.entity.LocNormalLog; import com.zy.asrs.entity.param.LocNormalStockOutParam; import com.zy.asrs.entity.param.StockOutParam; import com.zy.asrs.service.LocNormalLogService; import com.zy.asrs.service.LocNormalService; import com.zy.asrs.service.OutStockService; import com.zy.asrs.service.WorkService; import com.zy.asrs.utils.VersionUtils; import com.zy.common.service.erp.ErpService; import com.zy.common.service.erp.entity.OutStockBillEntry; import com.zy.common.web.BaseController; @@ -41,6 +45,8 @@ private LocNormalService locNormalService; @Autowired private ErpService erpService; @Autowired private LocNormalLogService locNormalLogService; /** * @@ -124,9 +130,20 @@ logLocNormal.setMemo(locNormal.getMemo()); logLocNormal.setState("2"); // 生成出库记录 locNormalService.insert(logLocNormal); // locNormalService.insert(logLocNormal); // 更新原先平仓记录 locNormalService.updateLocNormal(locNormal.getMatnr(), locNormal.getAnfme().subtract(locNormals.getAnfme()), modiUser, modiTime, locNormal.getId()); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, locNormals); locLog.setAnfme(locNormals.getAnfme().doubleValue()); locLog.setIoType(2); locLog.setCreateTime(new Date()); locLog.setCreateUser(modiUser); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓出库记录插入失败,数据:" + logStr); } } else { // 把对应物料平仓库存出库 locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId()); src/main/java/com/zy/asrs/entity/LocNoramlLog.java
File was deleted src/main/java/com/zy/asrs/entity/LocNormalLog.java
New file @@ -0,0 +1,105 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; /** * Created by vincent on 2021/6/21 */ @Data @TableName("asr_loc_normal_log") public class LocNormalLog { @ApiModelProperty(value= "物料") private String matnr; @ApiModelProperty(value= "物料描述") private String maktx; @ApiModelProperty(value= "规格") private String lgnum; @ApiModelProperty(value= "物料类别") private String type; @ApiModelProperty(value= "生产单号") private String mnemonic; @ApiModelProperty(value= "通知单号") private String supplier; @ApiModelProperty(value= "仓库") private String warehouse; @TableField(exist = false) private String warehouseName; @ApiModelProperty(value= "数量") private Double anfme; @ApiModelProperty(value= "备注") private String memo; @ApiModelProperty(value= "创建时间") @TableField("create_time") private Date createTime; @ApiModelProperty(value= "修改时间") @TableField("update_time") private Date updateTime; @ApiModelProperty(value= "创建者") @TableField("create_user") private Long createUser; @ApiModelProperty(value= "修改者") @TableField("update_user") private Long updateUser; @ApiModelProperty(value= "出入库类型(1入库,2出库, 3删除, 4更新)") @TableField("io_type") private Integer ioType; public String getCreateUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.createUser); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } public String getUpdateUser$(){ UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.updateUser); if (!Cools.isEmpty(user)){ return String.valueOf(user.getUsername()); } return null; } public String getCreateTime$(){ if (Cools.isEmpty(this.createTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); } public String getUpdateTime$(){ if (Cools.isEmpty(this.updateTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); } } src/main/java/com/zy/asrs/mapper/LocNormalLogMapper.java
New file @@ -0,0 +1,17 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.LocNormalLog; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import java.math.BigDecimal; import java.util.Date; import java.util.List; @Mapper @Repository public interface LocNormalLogMapper extends BaseMapper<LocNormalLog> { } src/main/java/com/zy/asrs/service/LocNormalLogService.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.LocNormalLog; import java.math.BigDecimal; import java.util.Date; import java.util.List; public interface LocNormalLogService extends IService<LocNormalLog> { } src/main/java/com/zy/asrs/service/impl/LocNormalLogServiceImpl.java
New file @@ -0,0 +1,39 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.LocNormal; import com.zy.asrs.entity.LocNormalLog; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WaitPakinLog; import com.zy.asrs.entity.param.ERPselectParam; import com.zy.asrs.mapper.LocNormalLogMapper; import com.zy.asrs.mapper.LocNormalMapper; import com.zy.asrs.mapper.OutStockMapper; import com.zy.asrs.service.LocNormalLogService; import com.zy.asrs.service.LocNormalService; import com.zy.asrs.service.WaitPakinLogService; import com.zy.asrs.service.WaitPakinService; import com.zy.asrs.utils.VersionUtils; import com.zy.common.service.erp.ErpService; import com.zy.common.service.erp.ErpSqlServer; import com.zy.common.service.erp.entity.CPICMO; import com.zy.common.service.erp.entity.OutStockBillEntry; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @Slf4j @Service("locNormalLogService") public class LocNormalLogServiceImpl extends ServiceImpl<LocNormalLogMapper, LocNormalLog> implements LocNormalLogService { } src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -1,18 +1,19 @@ package com.zy.asrs.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.LocNoramlLog; import com.zy.asrs.entity.LocNormalLog; import com.zy.asrs.entity.LocNormal; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WaitPakinLog; import com.zy.asrs.entity.param.ERPselectParam; import com.zy.asrs.mapper.LocNormalMapper; import com.zy.asrs.mapper.OutStockMapper; import com.zy.asrs.service.LocNormalLogService; import com.zy.asrs.service.LocNormalService; import com.zy.asrs.service.WaitPakinLogService; import com.zy.asrs.service.WaitPakinService; @@ -46,6 +47,8 @@ WaitPakinLogService waitPakinLogService; @Autowired ErpService erpService; @Autowired LocNormalLogService locNormalLogService; @Override public List<LocNormal> getLocNormalData() { @@ -60,11 +63,35 @@ @Override public void outLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) { baseMapper.outLocNormal(matnr, modiUser, modiTime, id); LocNormal data = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("id", id)); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, data); locLog.setAnfme(data.getAnfme().doubleValue()); locLog.setIoType(2); locLog.setCreateTime(new Date()); locLog.setCreateUser(modiUser); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓出库记录插入失败,数据:" + logStr); } } @Override public void removeLocNormal(String matnr, Long modiUser, Date modiTime, Integer id) { baseMapper.removeLocNormal(matnr, modiUser, modiTime, id); LocNormal data = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("id", id)); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, data); locLog.setAnfme(data.getAnfme().doubleValue()); locLog.setIoType(4); // 删除 locLog.setCreateTime(new Date()); locLog.setCreateUser(modiUser); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓库存删除记录插入失败,数据:" + logStr); } } @Override @@ -88,6 +115,17 @@ // cust_wait_pakin转cust_wait_pakin_log，并更新数量 custWaitPakinToLog(list.get(i), updateAnfme); } // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(updateAnfme); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } else { // erp更新 updateCPICMO(list.get(i)); @@ -96,6 +134,17 @@ if (baseMapper.pdaLocNormalIn(addList) > 0) { // cust_wait_pakin转cust_wait_pakin_log，并更新数量 custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue()); } // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(list.get(i).getAnfme().doubleValue()); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } } else { @@ -112,13 +161,24 @@ ErpSql = MessageFormat.format(ErpSql, maxKey + 1, list.get(i).getAnfme(), list.get(i).getAnfme(), list.get(i).getAnfme(), list.get(i).getMatnr(), list.get(i).getAnfme(), list.get(i).getMnemonic()); erpSqlServer.update(ErpSql); } // Double updateAnfme = new Double(list.get(i).getAnfme().doubleValue()); Double updateAnfme = new Double(list.get(i).getAnfme().doubleValue()); // 平仓入库（更新）逻辑 list.get(i).setAnfme(oldLocList.getAnfme().add(list.get(i).getAnfme())); updateList.add(list.get(i)); if (baseMapper.withoutSupplierLocNormalUpdate(updateList) > 0) { // cust_wait_pakin转cust_wait_pakin_log，并更新数量 // custWaitPakinToLog(list.get(i), updateAnfme); } // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(updateAnfme); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } else { // erp更新 @@ -135,6 +195,17 @@ if (baseMapper.pdaLocNormalIn(addList) > 0) { // cust_wait_pakin转cust_wait_pakin_log，并更新数量 // custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue()); } // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(list.get(i).getAnfme().doubleValue()); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } } @@ -248,12 +319,16 @@ custWaitPakinToLog(list.get(i), updateAnfme); } // 生成平仓出入库记录 LocNoramlLog log = new LocNoramlLog(); VersionUtils.setLocNormalLog(log, list.get(i)); log.setAnfme(updateAnfme); log.setIoType(1); log.setCreateTime(new Date()); log.setCreateUser(list.get(i).getAppeUser()); LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(updateAnfme); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } else { // erp更新 @@ -265,13 +340,16 @@ custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue()); } // 生成平仓出入库记录 LocNoramlLog log = new LocNoramlLog(); VersionUtils.setLocNormalLog(log, list.get(i)); log.setAnfme(list.get(i).getAnfme().doubleValue()); log.setIoType(1); log.setCreateTime(new Date()); log.setCreateUser(list.get(i).getAppeUser()); LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(list.get(i).getAnfme().doubleValue()); locLog.setIoType(1); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓入库记录插入失败,数据:" + logStr); } } } else { throw new CoolException("通知单号不可为空"); @@ -366,10 +444,32 @@ for (Integer i = 0; i < list.size(); i++) { if (list.get(i).getAnfme().equals(list.get(i).getAnfmeOut())) { baseMapper.pdaLocNormalOut1(list.get(i).getId(), list.get(i).getMatnr(), list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse()); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme(list.get(i).getAnfmeOut().doubleValue()); locLog.setIoType(2); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓出库记录插入失败,数据:" + logStr); } } if (list.get(i).getAnfmeOut().compareTo(list.get(i).getAnfme()) == -1) { BigDecimal diff = (list.get(i).getAnfme()).subtract(list.get(i).getAnfmeOut()); baseMapper.pdaLocNormalOut2(list.get(i).getId(), list.get(i).getMatnr(), diff, list.get(i).getModiUser(), list.get(i).getModiTime(), list.get(i).getWarehouse()); // 生成平仓出入库记录 LocNormalLog locLog = new LocNormalLog(); VersionUtils.setLocNormalLog(locLog, list.get(i)); locLog.setAnfme((list.get(i).getAnfmeOut()).doubleValue()); locLog.setIoType(2); locLog.setCreateTime(new Date()); locLog.setCreateUser(list.get(i).getAppeUser()); if (!locNormalLogService.insert(locLog)) { String logStr = JSON.toJSONString(locLog); log.info("平仓出库记录插入失败,数据:" + logStr); } } } } src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -6,8 +6,6 @@ import com.zy.common.service.erp.entity.M_item; import com.zy.common.utils.excel.matcode.MatCodeExcel; import java.util.List; /** * Created by vincent on 2020/7/14 */ @@ -85,7 +83,8 @@ matCode.setStr2(item.getMtypename()); // 规格型号 } public static void setLocNormalLog(LocNoramlLog log, LocNormal item) { // 平仓日志 public static void setLocNormalLog(LocNormalLog log, LocNormal item) { log.setMatnr(item.getMatnr()); log.setMaktx(item.getMaktx()); log.setLgnum(item.getLgnum()); src/main/resources/mapper/LocNormalLogMapper.xml
New file @@ -0,0 +1,24 @@ <?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.LocNormalLogMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocNormalLog"> <result column="matnr" property="matnr"/> <result column="maktx" property="maktx"/> <result column="lgnum" property="lgnum"/> <result column="type" property="type"/> <result column="mnemonic" property="mnemonic"/> <result column="supplier" property="supplier"/> <result column="warehouse" property="warehouse"/> <result column="warehouseName" property="warehouseName"/> <result column="anfme" property="anfme"/> <result column="memo" property="memo"/> <result column="create_time" property="createTime"/> <result column="update_time" property="updateTime"/> <result column="create_user" property="createTime"/> <result column="update_user" property="updateUser"/> <result column="io_type" property="ioType"/> </resultMap> </mapper> src/main/webapp/static/js/locNormal/locNormal.js
@@ -237,7 +237,7 @@ data: top.reObject(param), method: 'POST', success: function (res) { layer.msg("") layer.msg("修改成功"); }, }); }, function () { src/main/webapp/static/js/locNormal/normalReport.js
@@ -5,7 +5,8 @@ function getCol() { var cols = []; cols.push( {field: 'appeTime$', align: 'center', title: '出入库时间', width: 180} {field: 'createTime$', align: 'center', title: '出入库时间', width: 180} , {field: 'updateTime$', align: 'center', title: '修改时间', width: 180, hide: true} , {field: 'warehouse', align: 'center', title: '库区', width: 100} , {field: 'matnr', align: 'center', title: '物料编码', width: 140} , {field: 'maktx', align: 'center', title: '物料名称', width: 400} @@ -14,8 +15,8 @@ , {field: 'type', align: 'center', title: '物料类别', width: 120} , {field: 'mnemonic', align: 'center', title: '生产单号', width: 140} , {field: 'supplier', align: 'center', title: '通知单号', width: 140} , {field: 'altme', align: 'center', title: '单位', hide: true} , {field: 'memo', align: 'center', title: '备注'} ) return cols; } @@ -70,7 +71,7 @@ headers: {token: localStorage.getItem('token')}, url: baseUrl + '/locNomal/getInListByDay', where: { state: '1', io_type: '1', }, page: true, limit: 16, @@ -118,7 +119,7 @@ form.on('submit(reset)', function (data) { pageCurr = 1; clearFormVal($('#search-box')); $("#state").val("1"); $("#io_type").val("1"); form.render(); tableReload(false); }); src/main/webapp/views/locNormal/normalReport.html
@@ -112,9 +112,11 @@ </div> <div class="layui-inline" style="width: 150px; margin-top: 4px"> <select id="state" name="state"> <select id="io_type" name="io_type"> <option value="1">入库</option> <option value="2">出库</option> <option value="3">修改</option> <option value="4">删除</option> </select> </div>
@@ -33,7 +33,7 @@ SET ANSI_PADDING OFF GO EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'出入库类型(1入库,2出库, 3删除)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_loc_normal_log', @level2type=N'COLUMN',@level2name=N'io_type' EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'出入库类型(1入库,2出库,3修改,4删除)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_loc_normal_log', @level2type=N'COLUMN',@level2name=N'io_type' GO
