| | |
| | | import com.core.common.BaseRes; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.asrs.entity.CombBillQueryVo; |
| | | import com.zy.asrs.entity.LocDetl; |
| | | import com.zy.asrs.entity.LocMast; |
| | | import com.zy.asrs.entity.WrkDetl; |
| | |
| | | mobileService.comb(combParam, getUserId()); |
| | | return R.ok(); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 组托 |
| | |
| | | @RequestMapping("/bill/query/auth") |
| | | @ManagerAuth(memo = "根据通知单查询明细") |
| | | public R billQuery(@RequestParam String billNo){ |
| | | List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo)); |
| | | List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty")); |
| | | List<CombBillQueryVo> vos = new ArrayList<>(); |
| | | if (!Cools.isEmpty(waitPakins)) { |
| | | if (!Cools.isEmpty(waitMatins)) { |
| | | for (WaitMatin waitMatin : waitMatins) { |
| | | CombBillQueryVo vo = new CombBillQueryVo(); |
| | | vo.setMatNo(waitMatin.getMatnr()); |
| | | vo.setMatName(waitMatin.getMaktx()); |
| | | vo.setCount(waitMatin.getAnfme()); |
| | | vo.setSupplier(waitMatin.getSupplier()); |
| | | vo.setAltme(waitMatin.getAltme()); |
| | | vo.setType(waitMatin.getType()); |
| | | vo.setLgnum(waitMatin.getLgnum()); |
| | | vo.setMatNo(waitMatin.getMatNo()); |
| | | vo.setMatName(waitMatin.getMatName()); |
| | | vo.setCount(waitMatin.getQty()-waitMatin.getInQty()); |
| | | vo.setBillNo(waitMatin.getBillNo()); |
| | | vo.setSeqNo(waitMatin.getSeqNo()); |
| | | vo.setUnit(waitMatin.getUnit()); |
| | | vo.setSpecs(waitMatin.getSpecs()); |
| | | vo.setSize(waitMatin.getSize()); |
| | | vo.setColor(waitMatin.getColor()); |
| | | vos.add(vo); |
| | | } |
| New file |
| | |
| | | package com.zy.asrs.controller; |
| | | |
| | | import com.alibaba.fastjson.JSONArray; |
| | | import com.alibaba.fastjson.JSONObject; |
| | | import com.baomidou.mybatisplus.mapper.EntityWrapper; |
| | | import com.baomidou.mybatisplus.mapper.Wrapper; |
| | | import com.baomidou.mybatisplus.plugins.Page; |
| | | import com.core.common.DateUtils; |
| | | import com.zy.asrs.entity.PltBarcode; |
| | | import com.zy.asrs.service.PltBarcodeService; |
| | | import com.core.annotations.ManagerAuth; |
| | | import com.core.common.BaseRes; |
| | | import com.core.common.Cools; |
| | | import com.core.common.R; |
| | | import com.zy.common.web.BaseController; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import java.util.*; |
| | | |
| | | @RestController |
| | | public class PltBarcodeController extends BaseController { |
| | | |
| | | @Autowired |
| | | private PltBarcodeService pltBarcodeService; |
| | | |
| | | @RequestMapping(value = "/pltBarcode/{id}/auth") |
| | | @ManagerAuth |
| | | public R get(@PathVariable("id") String id) { |
| | | return R.ok(pltBarcodeService.selectById(String.valueOf(id))); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/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){ |
| | | EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>(); |
| | | excludeTrash(param); |
| | | convert(param, wrapper); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | return R.ok(pltBarcodeService.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); |
| | | } |
| | | } |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/add/auth") |
| | | @ManagerAuth |
| | | public R add(PltBarcode pltBarcode) { |
| | | pltBarcodeService.insert(pltBarcode); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/update/auth") |
| | | @ManagerAuth |
| | | public R update(PltBarcode pltBarcode){ |
| | | if (Cools.isEmpty(pltBarcode) || null==pltBarcode.getSeqNo()){ |
| | | return R.error(); |
| | | } |
| | | pltBarcodeService.updateById(pltBarcode); |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/delete/auth") |
| | | @ManagerAuth |
| | | public R delete(@RequestParam(value="ids[]") Long[] ids){ |
| | | for (Long id : ids){ |
| | | pltBarcodeService.deleteById(id); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/export/auth") |
| | | @ManagerAuth |
| | | public R export(@RequestBody JSONObject param){ |
| | | EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>(); |
| | | List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); |
| | | Map<String, Object> map = excludeTrash(param.getJSONObject("pltBarcode")); |
| | | convert(map, wrapper); |
| | | List<PltBarcode> list = pltBarcodeService.selectList(wrapper); |
| | | return R.ok(exportSupport(list, fields)); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcodeQuery/auth") |
| | | @ManagerAuth |
| | | public R query(String condition) { |
| | | EntityWrapper<PltBarcode> wrapper = new EntityWrapper<>(); |
| | | wrapper.like("mat_no", condition); |
| | | Page<PltBarcode> page = pltBarcodeService.selectPage(new Page<>(0, 10), wrapper); |
| | | List<Map<String, Object>> result = new ArrayList<>(); |
| | | for (PltBarcode pltBarcode : page.getRecords()){ |
| | | Map<String, Object> map = new HashMap<>(); |
| | | map.put("id", pltBarcode.getSeqNo()); |
| | | map.put("value", pltBarcode.getMatNo()); |
| | | result.add(map); |
| | | } |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/pltBarcode/check/column/auth") |
| | | @ManagerAuth |
| | | public R query(@RequestBody JSONObject param) { |
| | | Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); |
| | | if (null != pltBarcodeService.selectOne(wrapper)){ |
| | | return R.parse(BaseRes.REPEAT).add(getComment(PltBarcode.class, String.valueOf(param.get("key")))); |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | } |
| New file |
| | |
| | | package com.zy.asrs.entity; |
| | | |
| | | import lombok.Data; |
| | | |
| | | /** |
| | | * Created by vincent on 2021/2/2 |
| | | */ |
| | | @Data |
| | | public class CombBillQueryVo { |
| | | |
| | | private String billNo; |
| | | |
| | | private Integer seqNo; |
| | | |
| | | private String matNo; |
| | | |
| | | private String matName; |
| | | |
| | | private String specs; |
| | | |
| | | private String size; |
| | | |
| | | private String color; |
| | | |
| | | private Double count; |
| | | |
| | | private String unit; |
| | | |
| | | // private String warehouse; |
| | | |
| | | // private String mnemonic; |
| | | |
| | | // private String supplier; |
| | | |
| | | // private String lgnum; |
| | | |
| | | private String type; |
| | | |
| | | // private String altme; |
| | | |
| | | } |
| New file |
| | |
| | | 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 org.springframework.format.annotation.DateTimeFormat; |
| | | |
| | | import java.io.Serializable; |
| | | import java.text.SimpleDateFormat; |
| | | import java.util.Date; |
| | | |
| | | @TableName("asr_plt_barcode") |
| | | public class PltBarcode implements Serializable { |
| | | |
| | | private static final long serialVersionUID = 1L; |
| | | |
| | | /** |
| | | * 条码 |
| | | */ |
| | | @ApiModelProperty(value= "条码") |
| | | @TableId(value = "barcode", type = IdType.INPUT) |
| | | private String barcode; |
| | | |
| | | /** |
| | | * 单据编号 |
| | | */ |
| | | @ApiModelProperty(value= "单据编号") |
| | | @TableId(value = "bill_no", type = IdType.INPUT) |
| | | @TableField("bill_no") |
| | | private String billNo; |
| | | |
| | | /** |
| | | * 序号 |
| | | */ |
| | | @ApiModelProperty(value= "序号") |
| | | @TableId(value = "seq_no", type = IdType.INPUT) |
| | | @TableField("seq_no") |
| | | private Integer seqNo; |
| | | |
| | | /** |
| | | * 单据类型 1: 采购入库 2: 生产入库 3: 调拨入库 4: 销售退回入库 5: 其他入库 |
| | | */ |
| | | @ApiModelProperty(value= "单据类型 1: 采购入库 2: 生产入库 3: 调拨入库 4: 销售退回入库 5: 其他入库 ") |
| | | @TableField("bill_type") |
| | | private Integer billType; |
| | | |
| | | /** |
| | | * 物料编码 |
| | | */ |
| | | @ApiModelProperty(value= "物料编码") |
| | | @TableField("mat_no") |
| | | private String matNo; |
| | | |
| | | /** |
| | | * 物料名称 |
| | | */ |
| | | @ApiModelProperty(value= "物料名称") |
| | | @TableField("mat_name") |
| | | private String matName; |
| | | |
| | | /** |
| | | * 数量 |
| | | */ |
| | | @ApiModelProperty(value= "数量") |
| | | private Double qty; |
| | | |
| | | /** |
| | | * 库位号 |
| | | */ |
| | | @ApiModelProperty(value= "库位号") |
| | | @TableField("loc_no") |
| | | private String locNo; |
| | | |
| | | /** |
| | | * 规格 |
| | | */ |
| | | @ApiModelProperty(value= "规格") |
| | | private String specs; |
| | | |
| | | /** |
| | | * 单位 |
| | | */ |
| | | @ApiModelProperty(value= "单位") |
| | | private String unit; |
| | | |
| | | /** |
| | | * 尺寸 |
| | | */ |
| | | @ApiModelProperty(value= "尺寸") |
| | | private String size; |
| | | |
| | | /** |
| | | * 颜色 |
| | | */ |
| | | @ApiModelProperty(value= "颜色") |
| | | private String color; |
| | | |
| | | /** |
| | | * 单重 |
| | | */ |
| | | @ApiModelProperty(value= "单重") |
| | | private Double weight; |
| | | |
| | | /** |
| | | * 备注 |
| | | */ |
| | | @ApiModelProperty(value= "备注") |
| | | private String memo; |
| | | |
| | | /** |
| | | * ERP连线 0: 非连线 1: ERP连线 |
| | | */ |
| | | @ApiModelProperty(value= "ERP连线 0: 非连线 1: ERP连线 ") |
| | | @TableField("link_erp") |
| | | private Integer linkErp; |
| | | |
| | | /** |
| | | * 完成状态 0: 待处理 1: 入库中 2: 入库完成 3: 取消入库 |
| | | */ |
| | | @ApiModelProperty(value= "完成状态 0: 待处理 1: 入库中 2: 入库完成 3: 取消入库 ") |
| | | @TableField("io_status") |
| | | private Integer ioStatus; |
| | | |
| | | /** |
| | | * 完成时间 |
| | | */ |
| | | @ApiModelProperty(value= "完成时间") |
| | | @TableField("io_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date ioTime; |
| | | |
| | | /** |
| | | * 修改人员 |
| | | */ |
| | | @ApiModelProperty(value= "修改人员") |
| | | @TableField("modi_user") |
| | | private Long modiUser; |
| | | |
| | | /** |
| | | * 修改时间 |
| | | */ |
| | | @ApiModelProperty(value= "修改时间") |
| | | @TableField("modi_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date modiTime; |
| | | |
| | | /** |
| | | * 建档人员 |
| | | */ |
| | | @ApiModelProperty(value= "建档人员") |
| | | @TableField("appe_user") |
| | | private Long appeUser; |
| | | |
| | | /** |
| | | * 建档时间 |
| | | */ |
| | | @ApiModelProperty(value= "建档时间") |
| | | @TableField("appe_time") |
| | | @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
| | | private Date appeTime; |
| | | |
| | | public PltBarcode() {} |
| | | |
| | | public PltBarcode(String barcode,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { |
| | | this.barcode = barcode; |
| | | this.billNo = billNo; |
| | | this.seqNo = seqNo; |
| | | this.billType = billType; |
| | | this.matNo = matNo; |
| | | this.matName = matName; |
| | | this.qty = qty; |
| | | this.locNo = locNo; |
| | | this.specs = specs; |
| | | this.unit = unit; |
| | | this.size = size; |
| | | this.color = color; |
| | | this.weight = weight; |
| | | this.memo = memo; |
| | | this.linkErp = linkErp; |
| | | this.ioStatus = ioStatus; |
| | | this.ioTime = ioTime; |
| | | this.modiUser = modiUser; |
| | | this.modiTime = modiTime; |
| | | this.appeUser = appeUser; |
| | | this.appeTime = appeTime; |
| | | } |
| | | |
| | | // PltBarcode pltBarcode = new PltBarcode( |
| | | // null, // 条码[非空] |
| | | // null, // 单据编号[非空] |
| | | // null, // 序号[非空] |
| | | // null, // 单据类型 |
| | | // null, // 物料编码[非空] |
| | | // null, // 物料名称[非空] |
| | | // null, // 数量 |
| | | // null, // 库位号 |
| | | // null, // 规格 |
| | | // null, // 单位 |
| | | // null, // 尺寸 |
| | | // null, // 颜色 |
| | | // null, // 单重 |
| | | // null, // 备注 |
| | | // null, // ERP连线 |
| | | // null, // 完成状态 |
| | | // null, // 完成时间 |
| | | // null, // 修改人员 |
| | | // null, // 修改时间 |
| | | // null, // 建档人员 |
| | | // null // 建档时间 |
| | | // ); |
| | | |
| | | public String getBarcode() { |
| | | return barcode; |
| | | } |
| | | |
| | | public void setBarcode(String barcode) { |
| | | this.barcode = barcode; |
| | | } |
| | | |
| | | public String getBillNo() { |
| | | return billNo; |
| | | } |
| | | |
| | | public void setBillNo(String billNo) { |
| | | this.billNo = billNo; |
| | | } |
| | | |
| | | public Integer getSeqNo() { |
| | | return seqNo; |
| | | } |
| | | |
| | | public void setSeqNo(Integer seqNo) { |
| | | this.seqNo = seqNo; |
| | | } |
| | | |
| | | public Integer getBillType() { |
| | | return billType; |
| | | } |
| | | |
| | | public String getBillType$(){ |
| | | if (null == this.billType){ return null; } |
| | | switch (this.billType){ |
| | | case 1: |
| | | return "采购入库"; |
| | | case 2: |
| | | return "生产入库"; |
| | | case 3: |
| | | return "调拨入库"; |
| | | case 4: |
| | | return "销售退回入库"; |
| | | case 5: |
| | | return "其他入库"; |
| | | default: |
| | | return String.valueOf(this.billType); |
| | | } |
| | | } |
| | | |
| | | public void setBillType(Integer billType) { |
| | | this.billType = billType; |
| | | } |
| | | |
| | | public String getMatNo() { |
| | | return matNo; |
| | | } |
| | | |
| | | public void setMatNo(String matNo) { |
| | | this.matNo = matNo; |
| | | } |
| | | |
| | | public String getMatName() { |
| | | return matName; |
| | | } |
| | | |
| | | public void setMatName(String matName) { |
| | | this.matName = matName; |
| | | } |
| | | |
| | | public Double getQty() { |
| | | return qty; |
| | | } |
| | | |
| | | public void setQty(Double qty) { |
| | | this.qty = qty; |
| | | } |
| | | |
| | | public String getLocNo() { |
| | | return locNo; |
| | | } |
| | | |
| | | public void setLocNo(String locNo) { |
| | | this.locNo = locNo; |
| | | } |
| | | |
| | | public String getSpecs() { |
| | | return specs; |
| | | } |
| | | |
| | | public void setSpecs(String specs) { |
| | | this.specs = specs; |
| | | } |
| | | |
| | | public String getUnit() { |
| | | return unit; |
| | | } |
| | | |
| | | public void setUnit(String unit) { |
| | | this.unit = unit; |
| | | } |
| | | |
| | | public String getSize() { |
| | | return size; |
| | | } |
| | | |
| | | public void setSize(String size) { |
| | | this.size = size; |
| | | } |
| | | |
| | | public String getColor() { |
| | | return color; |
| | | } |
| | | |
| | | public void setColor(String color) { |
| | | this.color = color; |
| | | } |
| | | |
| | | public Double getWeight() { |
| | | return weight; |
| | | } |
| | | |
| | | public void setWeight(Double weight) { |
| | | this.weight = weight; |
| | | } |
| | | |
| | | public String getMemo() { |
| | | return memo; |
| | | } |
| | | |
| | | public void setMemo(String memo) { |
| | | this.memo = memo; |
| | | } |
| | | |
| | | public Integer getLinkErp() { |
| | | return linkErp; |
| | | } |
| | | |
| | | public String getLinkErp$(){ |
| | | if (null == this.linkErp){ return null; } |
| | | switch (this.linkErp){ |
| | | case 0: |
| | | return "非连线"; |
| | | case 1: |
| | | return "ERP连线"; |
| | | default: |
| | | return String.valueOf(this.linkErp); |
| | | } |
| | | } |
| | | |
| | | public void setLinkErp(Integer linkErp) { |
| | | this.linkErp = linkErp; |
| | | } |
| | | |
| | | public Integer getIoStatus() { |
| | | return ioStatus; |
| | | } |
| | | |
| | | public String getIoStatus$(){ |
| | | if (null == this.ioStatus){ return null; } |
| | | switch (this.ioStatus){ |
| | | case 0: |
| | | return "待处理"; |
| | | case 1: |
| | | return "入库中"; |
| | | case 2: |
| | | return "入库完成"; |
| | | case 3: |
| | | return "取消入库"; |
| | | default: |
| | | return String.valueOf(this.ioStatus); |
| | | } |
| | | } |
| | | |
| | | public void setIoStatus(Integer ioStatus) { |
| | | this.ioStatus = ioStatus; |
| | | } |
| | | |
| | | public Date getIoTime() { |
| | | return ioTime; |
| | | } |
| | | |
| | | public String getIoTime$(){ |
| | | if (Cools.isEmpty(this.ioTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); |
| | | } |
| | | |
| | | public void setIoTime(Date ioTime) { |
| | | this.ioTime = ioTime; |
| | | } |
| | | |
| | | public Long getModiUser() { |
| | | return modiUser; |
| | | } |
| | | |
| | | public String getModiUser$(){ |
| | | UserService service = SpringUtils.getBean(UserService.class); |
| | | User user = service.selectById(this.modiUser); |
| | | if (!Cools.isEmpty(user)){ |
| | | return String.valueOf(user.getUsername()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public void setModiUser(Long modiUser) { |
| | | this.modiUser = modiUser; |
| | | } |
| | | |
| | | public Date getModiTime() { |
| | | return modiTime; |
| | | } |
| | | |
| | | public String getModiTime$(){ |
| | | if (Cools.isEmpty(this.modiTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); |
| | | } |
| | | |
| | | public void setModiTime(Date modiTime) { |
| | | this.modiTime = modiTime; |
| | | } |
| | | |
| | | public Long getAppeUser() { |
| | | return appeUser; |
| | | } |
| | | |
| | | public String getAppeUser$(){ |
| | | UserService service = SpringUtils.getBean(UserService.class); |
| | | User user = service.selectById(this.appeUser); |
| | | if (!Cools.isEmpty(user)){ |
| | | return String.valueOf(user.getUsername()); |
| | | } |
| | | return null; |
| | | } |
| | | |
| | | public void setAppeUser(Long appeUser) { |
| | | this.appeUser = appeUser; |
| | | } |
| | | |
| | | public Date getAppeTime() { |
| | | return appeTime; |
| | | } |
| | | |
| | | public String getAppeTime$(){ |
| | | if (Cools.isEmpty(this.appeTime)){ |
| | | return ""; |
| | | } |
| | | return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); |
| | | } |
| | | |
| | | public void setAppeTime(Date appeTime) { |
| | | this.appeTime = appeTime; |
| | | } |
| | | |
| | | |
| | | } |
| | |
| | | |
| | | private List<CombMat> combMats; |
| | | |
| | | private String billNo; |
| | | |
| | | public static class CombMat { |
| | | |
| | | private String seqNo; |
| | | |
| | | // 产品编号 |
| | | private String matNo; |
| | | |
| | | // 产品数量 |
| | | private Double count; |
| | | |
| | | public String getSeqNo() { |
| | | return seqNo; |
| | | } |
| | | |
| | | public void setSeqNo(String seqNo) { |
| | | this.seqNo = seqNo; |
| | | } |
| | | |
| | | public String getMatNo() { |
| | | return matNo; |
| | |
| | | |
| | | } |
| | | |
| | | public String getBillNo() { return billNo; } |
| | | |
| | | public void setBillNo(String billNo) { |
| | | this.billNo = billNo; |
| | | } |
| | | |
| | | public String getBarcode() { |
| | | return barcode; |
| | | } |
| New file |
| | |
| | | package com.zy.asrs.mapper; |
| | | |
| | | import com.zy.asrs.entity.PltBarcode; |
| | | import com.baomidou.mybatisplus.mapper.BaseMapper; |
| | | import org.apache.ibatis.annotations.Mapper; |
| | | import org.springframework.stereotype.Repository; |
| | | |
| | | @Mapper |
| | | @Repository |
| | | public interface PltBarcodeMapper extends BaseMapper<PltBarcode> { |
| | | |
| | | } |
| New file |
| | |
| | | package com.zy.asrs.service; |
| | | |
| | | import com.zy.asrs.entity.PltBarcode; |
| | | import com.baomidou.mybatisplus.service.IService; |
| | | |
| | | public interface PltBarcodeService extends IService<PltBarcode> { |
| | | |
| | | } |
| | |
| | | import com.core.common.BaseRes; |
| | | import com.core.common.Cools; |
| | | import com.core.exception.CoolException; |
| | | import com.zy.asrs.entity.LocDetl; |
| | | import com.zy.asrs.entity.MatCode; |
| | | import com.zy.asrs.entity.WaitPakin; |
| | | import com.zy.asrs.entity.PltBarcode; |
| | | import com.zy.asrs.entity.WrkDetl; |
| | | import com.zy.asrs.entity.param.CombParam; |
| | | import com.zy.asrs.service.MatCodeService; |
| | | import com.zy.asrs.service.MobileService; |
| | | import com.zy.asrs.service.WaitPakinService; |
| | | import com.zy.asrs.utils.VersionUtils; |
| | | import com.zy.asrs.service.*; |
| | | import com.zy.ints.entity.WaitMatin; |
| | | import com.zy.ints.service.WaitMatinService; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | import org.springframework.transaction.annotation.Transactional; |
| | |
| | | @Autowired |
| | | private MatCodeService matCodeService; |
| | | @Autowired |
| | | private WaitPakinService waitPakinService; |
| | | private WaitMatinService waitMatinService; |
| | | @Autowired |
| | | private LocDetlService locDetlService; |
| | | @Autowired |
| | | private WrkDetlService wrkDetlService; |
| | | @Autowired |
| | | private PltBarcodeService pltBarcodeService; |
| | | |
| | | @Override |
| | | @Transactional |
| | |
| | | if (Cools.isEmpty(param.getBarcode()) || param.getCombMats().isEmpty()) { |
| | | throw new CoolException(BaseRes.PARAM); |
| | | } |
| | | int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>(). |
| | | eq("zpallet", param.getBarcode()).eq("io_status", "N")); |
| | | if (count > 0) { |
| | | // int countPak = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode())); |
| | | // eq("zpallet", param.getBarcode()).eq("io_status", "N")); |
| | | int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode())); |
| | | int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())); |
| | | int countPlt = pltBarcodeService.selectCount(new EntityWrapper<PltBarcode>().eq("barcode",param.getBarcode())); |
| | | if (countPlt > 0 || countLoc > 0 || countWrk > 0) { |
| | | throw new CoolException("条码数据已存在"); |
| | | } |
| | | for (CombParam.CombMat combMat : param.getCombMats()) { |
| | | MatCode matCode = matCodeService.selectById(combMat.getMatNo()); |
| | | if (Cools.isEmpty(matCode)) { |
| | | throw new CoolException("产品数据错误"); |
| | | } |
| | | WaitPakin waitPakin = new WaitPakin(); |
| | | waitPakin.setZpallet(param.getBarcode()); // 托盘码 |
| | | waitPakin.setStatus("Y"); // 状态 |
| | | waitPakin.setQty(combMat.getCount()); // 数量 |
| | | waitPakin.setIoStatus("N"); // 入出状态 |
| | | waitPakin.setAppeUser(userId); |
| | | waitPakin.setAppeTime(new Date()); |
| | | waitPakin.setModiUser(userId); |
| | | waitPakin.setModiTime(new Date()); |
| | | VersionUtils.setWaitPakIn(waitPakin, matCode); |
| | | |
| | | if (!waitPakinService.insert(waitPakin)) { |
| | | throw new CoolException("保存数据失败"); |
| | | Date now = new Date(); |
| | | if (Cools.isEmpty(param.getBillNo())) { |
| | | for (CombParam.CombMat combMat : param.getCombMats()) { |
| | | MatCode matCode = matCodeService.selectOne(new EntityWrapper<MatCode>().eq("mat_no", combMat.getMatNo())); |
| | | if (Cools.isEmpty(matCode)) { |
| | | throw new CoolException("物料数据错误"); |
| | | } |
| | | PltBarcode pltBarcode = new PltBarcode(); |
| | | pltBarcode.setBarcode(param.getBarcode()); |
| | | pltBarcode.setBillNo(""); |
| | | pltBarcode.setSeqNo(0); |
| | | pltBarcode.setBillType(5); |
| | | pltBarcode.setMatNo(matCode.getMatNo()); |
| | | pltBarcode.setMatName(matCode.getMatName()); |
| | | pltBarcode.setQty(combMat.getCount()); |
| | | pltBarcode.setUnit(matCode.getUnit()); |
| | | pltBarcode.setSpecs(matCode.getSpecs()); |
| | | pltBarcode.setSize(matCode.getSize()); |
| | | pltBarcode.setColor(matCode.getColor()); |
| | | pltBarcode.setLinkErp(0); |
| | | pltBarcode.setModiUser(userId); |
| | | pltBarcode.setModiTime(now); |
| | | pltBarcode.setAppeUser(userId); |
| | | pltBarcode.setAppeTime(now); |
| | | |
| | | if (!pltBarcodeService.insert(pltBarcode)) { |
| | | throw new CoolException("保存数据失败"); |
| | | } |
| | | } |
| | | } else { |
| | | // 关联通知单组托 |
| | | for (CombParam.CombMat combMat : param.getCombMats()) { |
| | | WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>() |
| | | .eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo())); |
| | | |
| | | if (waitMatin == null) { |
| | | throw new CoolException("通知单不存在" + combMat.getMatNo() + "数据!"); |
| | | } |
| | | |
| | | if (combMat.getCount() > (waitMatin.getQty()-waitMatin.getInQty())) { |
| | | throw new CoolException(combMat.getMatNo() + "组托物料数量不足!"); |
| | | } |
| | | |
| | | PltBarcode pltBarcode = new PltBarcode(); |
| | | pltBarcode.setBarcode(param.getBarcode()); |
| | | pltBarcode.setBillNo(waitMatin.getBillNo()); |
| | | pltBarcode.setSeqNo(waitMatin.getSeqNo()); |
| | | pltBarcode.setBillType(waitMatin.getBillType()); |
| | | pltBarcode.setMatNo(waitMatin.getMatNo()); |
| | | pltBarcode.setMatName(waitMatin.getMatName()); |
| | | pltBarcode.setQty(combMat.getCount()); |
| | | pltBarcode.setUnit(waitMatin.getUnit()); |
| | | pltBarcode.setSpecs(waitMatin.getSpecs()); |
| | | pltBarcode.setSize(waitMatin.getSize()); |
| | | pltBarcode.setColor(waitMatin.getColor()); |
| | | pltBarcode.setLinkErp(waitMatin.getLinkErp()); |
| | | pltBarcode.setModiUser(userId); |
| | | pltBarcode.setModiTime(now); |
| | | pltBarcode.setAppeUser(userId); |
| | | pltBarcode.setAppeTime(now); |
| | | |
| | | if (!pltBarcodeService.insert(pltBarcode)) { |
| | | throw new CoolException("保存数据失败"); |
| | | } |
| | | |
| | | waitMatin.setInQty(combMat.getCount() + waitMatin.getInQty()); |
| | | if (!waitMatinService.update(waitMatin,new EntityWrapper<WaitMatin>() |
| | | .eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()))){ |
| | | throw new CoolException("更新数据失败"); |
| | | } |
| | | |
| | | } |
| | | } |
| | | } |
| New file |
| | |
| | | package com.zy.asrs.service.impl; |
| | | |
| | | import com.zy.asrs.mapper.PltBarcodeMapper; |
| | | import com.zy.asrs.entity.PltBarcode; |
| | | import com.zy.asrs.service.PltBarcodeService; |
| | | import com.baomidou.mybatisplus.service.impl.ServiceImpl; |
| | | import org.springframework.stereotype.Service; |
| | | |
| | | @Service("pltBarcodeService") |
| | | public class PltBarcodeServiceImpl extends ServiceImpl<PltBarcodeMapper, PltBarcode> implements PltBarcodeService { |
| | | |
| | | } |
| | |
| | | generator.url="192.168.4.208:1433;databasename=xgmasrs"; |
| | | generator.username="sa"; |
| | | generator.password="sa@123"; |
| | | generator.table="ints_stock_sync"; |
| | | generator.packagePath="com.zy.ints"; |
| | | generator.html=false; |
| | | generator.js=false; |
| | | generator.htmlDetail=false; |
| | | generator.table="asr_plt_barcode"; |
| | | generator.packagePath="com.zy.asrs"; |
| | | // generator.html=false; |
| | | // generator.js=false; |
| | | // generator.htmlDetail=false; |
| | | generator.build(); |
| | | } |
| | | |
| New file |
| | |
| | | -- save pltBarcode record |
| | | -- mysql |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode/pltBarcode.html', 'pltBarcode管理', null , '2', null , '1'); |
| | | |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#view', '查询', '', '3', '0', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-add', '新增', '', '3', '1', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-edit', '编辑', '', '3', '2', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-delete', '删除', '', '3', '3', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-export', '导出', '', '3', '4', '1'); |
| | | insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'pltBarcode#btn-into', '导入', '', '3', '5', '1'); |
| | | |
| | | -- sqlserver |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode/pltBarcode.html', N'组托数据管理', ‘222’, '2', null, '1'); |
| | | |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#view', N'查询', '20469', '3', '0', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-add', N'新增', '20469', '3', '1', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-edit', N'编辑', '20469', '3', '2', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-delete', N'删除', '20469', '3', '3', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-export', N'导出', '20469', '3', '4', '1'); |
| | | insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'pltBarcode#btn-into', N'导入', '20469', '3', '5', '1'); |
| New file |
| | |
| | | <?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.PltBarcodeMapper"> |
| | | |
| | | <!-- 通用查询映射结果 --> |
| | | <resultMap id="BaseResultMap" type="com.zy.asrs.entity.PltBarcode"> |
| | | <result column="barcode" property="barcode" /> |
| | | <result column="bill_no" property="billNo" /> |
| | | <result column="seq_no" property="seqNo" /> |
| | | <result column="bill_type" property="billType" /> |
| | | <result column="mat_no" property="matNo" /> |
| | | <result column="mat_name" property="matName" /> |
| | | <result column="qty" property="qty" /> |
| | | <result column="loc_no" property="locNo" /> |
| | | <result column="specs" property="specs" /> |
| | | <result column="unit" property="unit" /> |
| | | <result column="size" property="size" /> |
| | | <result column="color" property="color" /> |
| | | <result column="weight" property="weight" /> |
| | | <result column="memo" property="memo" /> |
| | | <result column="link_erp" property="linkErp" /> |
| | | <result column="io_status" property="ioStatus" /> |
| | | <result column="io_time" property="ioTime" /> |
| | | <result column="modi_user" property="modiUser" /> |
| | | <result column="modi_time" property="modiTime" /> |
| | | <result column="appe_user" property="appeUser" /> |
| | | <result column="appe_time" property="appeTime" /> |
| | | |
| | | </resultMap> |
| | | |
| | | </mapper> |
| New file |
| | |
| | | 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: '#pltBarcode', |
| | | headers: {token: localStorage.getItem('token')}, |
| | | url: baseUrl+'/pltBarcode/list/auth', |
| | | page: true, |
| | | limit: 16, |
| | | limits: [16, 30, 50, 100, 200, 500], |
| | | toolbar: '#toolbar', |
| | | cellMinWidth: 50, |
| | | cols: [[ |
| | | {type: 'checkbox'} |
| | | ,{field: 'barcode', align: 'center',title: '条码'} |
| | | ,{field: 'billNo', align: 'center',title: '单据编号'} |
| | | ,{field: 'seqNo', align: 'center',title: '序号'} |
| | | ,{field: 'billType$', align: 'center',title: '单据类型', hide: true} |
| | | ,{field: 'matNo', align: 'center',title: '物料编码'} |
| | | ,{field: 'matName', align: 'center',title: '物料名称'} |
| | | ,{field: 'qty', align: 'center',title: '数量'} |
| | | ,{field: 'locNo', align: 'center',title: '库位号'} |
| | | ,{field: 'specs', align: 'center',title: '规格'} |
| | | ,{field: 'unit', align: 'center',title: '单位'} |
| | | ,{field: 'size', align: 'center',title: '尺寸', hide: true} |
| | | ,{field: 'color', align: 'center',title: '颜色', hide: true} |
| | | ,{field: 'weight', align: 'center',title: '单重', hide: true} |
| | | ,{field: 'memo', align: 'center',title: '备注'} |
| | | ,{field: 'linkErp$', align: 'center',title: 'ERP连线', hide: true} |
| | | ,{field: 'ioStatus$', align: 'center',title: '完成状态', hide: true} |
| | | ,{field: 'ioTime$', align: 'center',title: '完成时间', hide: true} |
| | | ,{field: 'modiUser$', align: 'center',title: '修改人员',event: 'modiUser', style: 'cursor:pointer', hide: true} |
| | | ,{field: 'modiTime$', align: 'center',title: '修改时间', hide: true} |
| | | ,{field: 'appeUser$', align: 'center',title: '建档人员',event: 'appeUser', style: 'cursor:pointer', hide: true} |
| | | ,{field: 'appeTime$', align: 'center',title: '建档时间', hide: true} |
| | | |
| | | ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150} |
| | | ]], |
| | | 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(pltBarcode)', 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(pltBarcode)', 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; |
| | | } |
| | | var ids = checkStatus.map(function (d) { |
| | | return d.seqNo; |
| | | }); |
| | | del(ids); |
| | | 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 = { |
| | | 'pltBarcode': exportData, |
| | | 'fields': fields |
| | | }; |
| | | $.ajax({ |
| | | url: baseUrl+"/pltBarcode/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(pltBarcode)', function(obj){ |
| | | var data = obj.data; |
| | | switch (obj.event) { |
| | | case 'edit': |
| | | showEditModel(data); |
| | | break; |
| | | case "del": |
| | | var ids = [data.seqNo]; |
| | | del(ids); |
| | | break; |
| | | } |
| | | }); |
| | | |
| | | /* 弹窗 - 新增、修改 */ |
| | | function showEditModel(mData) { |
| | | admin.open({ |
| | | type: 1, |
| | | area: '600px', |
| | | title: (mData ? '修改' : '添加') + '订单状态', |
| | | content: $('#editDialog').html(), |
| | | success: function (layero, dIndex) { |
| | | layDateRender(); |
| | | form.val('detail', mData); |
| | | form.on('submit(editSubmit)', function (data) { |
| | | var loadIndex = layer.load(2); |
| | | $.ajax({ |
| | | url: baseUrl+"/pltBarcode/"+(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+"/pltBarcode/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() { |
| | | layDate.render({ |
| | | elem: '#ioTime\\$', |
| | | type: 'datetime' |
| | | }); |
| | | layDate.render({ |
| | | elem: '#modiTime\\$', |
| | | type: 'datetime' |
| | | }); |
| | | layDate.render({ |
| | | elem: '#appeTime\\$', |
| | | type: 'datetime' |
| | | }); |
| | | |
| | | } |
| | | 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} |
| | | }); |
| | | } |
| | |
| | | </tr> |
| | | </table> |
| | | </div> |
| | | <div class="form-item"> |
| | | <table style="display: inline"> |
| | | <tr> |
| | | <td> |
| | | <span style="width: 35px; margin-right: 5px">单号</span> |
| | | </td> |
| | | <td style="text-align: left"> |
| | | <input id="supplier" type="text" disabled="disabled"> |
| | | </td> |
| | | </tr> |
| | | </table> |
| | | </div> |
| | | <!-- <div class="form-item">--> |
| | | <!-- <table style="display: inline">--> |
| | | <!-- <tr>--> |
| | | <!-- <td>--> |
| | | <!-- <span style="width: 35px; margin-right: 5px">单号</span>--> |
| | | <!-- </td>--> |
| | | <!-- <td style="text-align: left">--> |
| | | <!-- <input id="supplier" type="text" disabled="disabled">--> |
| | | <!-- </td>--> |
| | | <!-- </tr>--> |
| | | <!-- </table>--> |
| | | <!-- </div>--> |
| | | </div> |
| | | <div class="form-item" style="margin-top: 5px"> |
| | | <span style="vertical-align: middle">数量</span> |
| | |
| | | width: 70 |
| | | }, |
| | | {field: 'matNo', align: 'center', title: '产品编码', event: 'modify'}, |
| | | {field: 'matName', align: 'center', title: '产品名称', event: 'modify'} |
| | | {field: 'matName', align: 'center', title: '产品名称', event: 'modify'}, |
| | | {field: 'seqNo', align: 'center', title: '序号', event: 'modify'} |
| | | // {field: 'color', align: 'center', title: '颜色', event: 'modify',} |
| | | ]], |
| | | done: function (res, curr, count) { |
| | |
| | | success: function (layero, index) { |
| | | $('#matNo').val(data.matNo); |
| | | $('#matName').val(data.matName); |
| | | // $('#supplier').val(data.billNo); |
| | | $('#count').val(data.count); |
| | | maxCount = data.count; |
| | | } |
| | |
| | | // 移除物料 |
| | | function remove() { |
| | | var matNo = $('#matNo').val(); |
| | | var supplier = $("#supplier").val() === '' ? null : $("#supplier").val(); |
| | | // var supplier = $("#supplier").val() === '' ? null : $("#supplier").val(); |
| | | for (var j = 0; j < matData.length; j++) { |
| | | if (matNo === matData[j].matNo) { |
| | | matData.splice(j, 1); |
| | |
| | | tableIns.reload({data: matData}); |
| | | } |
| | | |
| | | function test() { |
| | | $.ajax({ |
| | | url: baseUrl+"/erp/update", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | contentType:'application/json;charset=UTF-8', |
| | | method: 'POST', |
| | | async: false, |
| | | success: function (res) { |
| | | if (res.code === 200) { |
| | | layer.msg("测试功能成功"); |
| | | } else if (res.code === 403) { |
| | | top.location.href = baseUrl + "/pda"; |
| | | } else { |
| | | tips(res.msg, true) |
| | | } |
| | | } |
| | | }); |
| | | } |
| | | |
| | | function test() { |
| | | $.ajax({ |
| | | url: baseUrl+"/erp/outUpdate", |
| | | headers: {'token': localStorage.getItem('token')}, |
| | | contentType:'application/json;charset=UTF-8', |
| | | method: 'POST', |
| | | async: false, |
| | | success: function (res) { |
| | | if (res.code === 200) { |
| | | layer.msg("测试功能成功"); |
| | | } else if (res.code === 403) { |
| | | top.location.href = baseUrl + "/pda"; |
| | | } else { |
| | | tips(res.msg, true) |
| | | } |
| | | } |
| | | }); |
| | | } |
| | | |
| | | // 组托 |
| | | function comb() { |
| | | var barcode = $('#code').val(); |
| | |
| | | return; |
| | | } |
| | | var billNo = $('#billNo').val(); |
| | | debugger |
| | | $.ajax({ |
| | | url: baseUrl + "/mobile/comb/auth", |
| | | headers: {'token': localStorage.getItem('token')}, |
| New file |
| | |
| | | <!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/admin.css?v=318" 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="id" placeholder="编号" autocomplete="off"> |
| | | </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="pltBarcode" lay-filter="pltBarcode"></table> |
| | | </div> |
| | | <script type="text/html" id="toolbar"> |
| | | <div class="layui-btn-container"> |
| | | <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-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button> |
| | | </div> |
| | | </script> |
| | | |
| | | <script type="text/html" id="operate"> |
| | | <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">修改</a> |
| | | <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">删除</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/pltBarcode/pltBarcode.js" charset="utf-8"></script> |
| | | </body> |
| | | <!-- 表单弹窗 --> |
| | | <script type="text/html" id="editDialog"> |
| | | <form id="detail" lay-filter="detail" class="layui-form admin-form"> |
| | | <input name="id" type="hidden"> |
| | | <div class="layui-row"> |
| | | <div class="layui-col-md12"> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">条码: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="barcode" placeholder="请输入条码" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">单据编号: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="billNo" placeholder="请输入单据编号" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">序号: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="seqNo" placeholder="请输入序号" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">单据类型: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="billType"> |
| | | <option value="">请选择单据类型</option> |
| | | <option value="1">采购入库</option> |
| | | <option value="2">生产入库</option> |
| | | <option value="3">调拨入库</option> |
| | | <option value="4">销售退回入库</option> |
| | | <option value="5">其他入库</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">物料编码: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="matNo" placeholder="请输入物料编码" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label layui-form-required">物料名称: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="matName" placeholder="请输入物料名称" lay-vertype="tips" lay-verify="required"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">数量: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="qty" placeholder="请输入数量"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">库位号: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="locNo" placeholder="请输入库位号"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">规格: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="specs" placeholder="请输入规格"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">单位: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="unit" placeholder="请输入单位"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">尺寸: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="size" placeholder="请输入尺寸"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">颜色: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="color" placeholder="请输入颜色"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">单重: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="weight" placeholder="请输入单重"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">备注: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="memo" placeholder="请输入备注"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">ERP连线: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="linkErp"> |
| | | <option value="">请选择ERP连线</option> |
| | | <option value="0">非连线</option> |
| | | <option value="1">ERP连线</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">完成状态: </label> |
| | | <div class="layui-input-block"> |
| | | <select name="ioStatus"> |
| | | <option value="">请选择完成状态</option> |
| | | <option value="0">待处理</option> |
| | | <option value="1">入库中</option> |
| | | <option value="2">入库完成</option> |
| | | <option value="3">取消入库</option> |
| | | </select> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">完成时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="ioTime" id="ioTime$" placeholder="请输入完成时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">修改人员: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="modiUser" placeholder="请输入修改人员"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">修改时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="modiTime" id="modiTime$" placeholder="请输入修改时间"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">建档人员: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="appeUser" placeholder="请输入建档人员"> |
| | | </div> |
| | | </div> |
| | | <div class="layui-form-item"> |
| | | <label class="layui-form-label">建档时间: </label> |
| | | <div class="layui-input-block"> |
| | | <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入建档时间"> |
| | | </div> |
| | | </div> |
| | | |
| | | </div> |
| | | </div> |
| | | <hr class="layui-bg-gray"> |
| | | <div class="layui-form-item text-right"> |
| | | <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button> |
| | | <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button> |
| | | </div> |
| | | </form> |
| | | </script> |
| | | </html> |
| | | |