Merge remote-tracking branch 'origin/develop' into develop

yihao.liu
2 parents 5a021c4f 5a254021
Showing 5 changed files with 24 additions and 15 deletions
src/main/java/com/huaheng/pc/config/container/domain/Container.java
src/main/java/com/huaheng/pc/config/location/domain/Location.java
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
src/main/java/com/huaheng/pc/config/material/domain/Material.java
src/main/resources/static/huaheng/js/huahengUI.js
@@ -194,7 +194,12 @@ public class Container implements Serializable {
     @ApiModelProperty(value="处理标记")
     private String processStamp;
  
-    private static final long serialVersionUID = 1L;
+  /**
+   * 打印机名称
+   * 当该类模板调用时
+   */
+  //    private static final String printName = "Bar Code Printer T-4503E";
+  private static final long serialVersionUID = 1L;
  
     @Override
     public String toString() {
@@ -217,7 +222,8 @@ public class Container implements Serializable {
         sb.append(", enable=").append(enable);
         sb.append(", printNum=").append(printNum);
         sb.append(", version=").append(version);
-        sb.append(", userDef1=").append(userDef1);
+      //        sb.append(", printName").append(printName);
+      sb.append(", userDef1=").append(userDef1);
         sb.append(", userDef2=").append(userDef2);
         sb.append(", userDef3=").append(userDef3);
         sb.append(", userDef4=").append(userDef4);
 package com.huaheng.pc.config.location.domain;
  
 import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
  
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
  
-import lombok.Data;
-import org.springframework.transaction.annotation.Transactional;
-
 @Data
 @TableName(value = "location")
 public class Location implements Serializable {
@@ -205,6 +203,8 @@ public class Location implements Serializable {
  
     @TableField(exist = false)
     private List<BigDecimal> qty;
+  // 打印机名称 标识
+  //    private static final String printName = "Bar Code Printer T-4503E";
  
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
 package com.huaheng.pc.config.location.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.config.location.domain.Location;
 import com.huaheng.pc.config.location.domain.LocationInfo;
+import com.huaheng.pc.config.location.mapper.LocationMapper;
 import com.huaheng.pc.config.locationType.domain.LocationType;
 import com.huaheng.pc.config.locationType.service.LocationTypeService;
 import com.huaheng.pc.config.zone.domain.Zone;
 import com.huaheng.pc.config.zone.service.ZoneService;
 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.text.MessageFormat;
 import java.util.*;
  
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.config.location.domain.Location;
-import com.huaheng.pc.config.location.mapper.LocationMapper;
-
 @Service("LocationService")
 public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> implements LocationService{
  
@@ -215,11 +214,11 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
             throw new ServiceException("库区编码不存在");
         }
         //TODO：胡海--在判断库位类型和库区是否匹配，应该用库位类型表进行判断。库位类型在库区存在即可
-        if(!zoneCode.equals(locationType)){
+       /* if(!zoneCode.equals(locationType)){
             throw new ServiceException(locationType+"的库位类型与"+ zoneCode +"库区不匹配");
-        }
+        }*/
  
-        List<Location> locations = new ArrayList<>();
+      List<Location> locations = new ArrayList<>(); // 为零？
         for (int i=firstRow.intValue(); i<=lastRow.intValue(); i++)  {
             for (int j=firstColumn.intValue(); j<=lastColumn.intValue(); j++)  {
                 for (int k=firstLayer.intValue(); k<=lastLayer.intValue(); k++)  {
@@ -7,9 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.huaheng.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
  
 @ApiModel(value="com.huaheng.pc.config.material.domain.Material")
 @Data
@@ -309,4 +310,6 @@ public class Material implements Serializable {
     @TableField(value = "isMix")
     @ApiModelProperty(value = "是否允许混放")
     private Boolean isMix;
+    /** 打印机名称 */
+    //    private static final  String printName = "Gprinter GP-1424D";
 }
 \ No newline at end of file
@@ -1028,6 +1028,7 @@ var table = {
             },
             // 批量打印信息
             batPrint: function () {
+                debugger;
                 table.set(); // 将当前页的table传入这边保存table信息
                 var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); // 判断是否有选中的记录返回行或第一行
                 if (rows.length == 0) {
@@ -1036,7 +1037,7 @@ var table = {
                 }
                 $.modal.confirm("确认要打印选中的" + rows.length + "条数据吗?", function () {
                     var url = table.options.printUrl; //
-                    // var data = {"ids": rows.join()}; // {"ids:"(\B+,)+} this a func 
+                    // var data = {"ids": rows.join()}; // {"ids:"(\B+,)+} this a func
                     // $.operate.submit(url,"post","json",data);
                     var param = "";
                     $(rows).each(function (i, item) {