diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java index f8dd1be..0c802a0 100644 --- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java +++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java @@ -3,7 +3,6 @@ package com.dev.swms.server.service.base.pojo; import com.dev.energy.server.exception.BusinessException; import com.dev.energy.server.model.EntityFactory; import com.dev.energy.server.service.pojo.DefaultBaseManager; -import com.dev.energy.server.util.LocalizedMessage; import com.dev.energy.server.web.security.UserHolder; import com.dev.swms.server.model.base.Address; import com.dev.swms.server.model.base.BillType; @@ -25,31 +24,20 @@ import com.dev.swms.server.model.shipping.PickTicket; import com.dev.swms.server.model.shipping.PickTicketDetail; import com.dev.swms.server.model.shipping.PickTicketStatus; import com.dev.swms.server.service.base.ImportFileManager; -import com.dev.swms.server.service.base.ItemManager; -import com.dev.swms.server.service.base.WarehouseManager; -import com.dev.swms.server.service.interfaceLog.InterfaceLogManager; -import com.dev.swms.server.service.inventory.InventoryManager; import com.dev.swms.server.service.receiving.ASNManager; -import com.dev.swms.server.service.receiving.MoveDocManager; -import com.dev.swms.server.service.receiving.PutawayAllocator; import com.dev.swms.server.service.sequence.BussinessCodeManager; import com.dev.swms.server.service.shipping.PickTicketManager; import com.dev.swms.server.utils.DateUtil; -import com.dev.swms.server.utils.DateUtils; import com.dev.swms.server.web.filter.WarehouseHolder; import com.itextpdf.text.pdf.PdfReader; import com.itextpdf.text.pdf.parser.PdfReaderContentParser; import com.itextpdf.text.pdf.parser.SimpleTextExtractionStrategy; import com.itextpdf.text.pdf.parser.TextExtractionStrategy; - import jxl.Sheet; import jxl.Workbook; import jxl.read.biff.BiffException; - import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.Writer; @@ -57,17 +45,13 @@ import java.math.BigDecimal; import java.net.URL; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - -import org.apache.pdfbox.pdfparser.PDFParser; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -80,10 +64,6 @@ import java.io.OutputStreamWriter; import java.io.FileOutputStream; import java.io.FileReader; -//import org.pdfbox.pdfparser.PDFParser; -//import org.pdfbox.pdmodel.PDDocument; -//import org.pdfbox.util.PDFTextStripper; - @SuppressWarnings("unchecked") public class DefaultImportFileManager extends DefaultBaseManager implements ImportFileManager{ protected final BussinessCodeManager bussinessCodeManager; @@ -582,7 +562,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo newLotInfo.setPropD2(dqr); ptd.setNewLotInfo(newLotInfo); ptd.setOrderQuantity(Double.parseDouble(zs)); - ptd.setLineNumber(xuhao); + ptd.setLineNumber(Integer.parseInt(xuhao)); ptd.setItem(item); // ptd.setEquatedQuantity(ttsl); // ptd.setLocCode(kwh); diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceItemManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceItemManager.java index 321a370..19d8796 100644 --- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceItemManager.java +++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceItemManager.java @@ -61,7 +61,6 @@ import com.dev.swms.server.model.shipping.PickTicketDetail; import com.dev.swms.server.model.shipping.PickTicketStatus; import com.dev.swms.server.service.base.ItemManager; import com.dev.swms.server.service.interfaceLog.InterfaceItemManager; -import com.dev.swms.server.service.interfaceLog.InterfaceLogManager; import com.dev.swms.server.service.inventory.InventoryManager; import com.dev.swms.server.service.receiving.ASNManager; import com.dev.swms.server.service.sequence.BussinessCodeManager; @@ -71,11 +70,9 @@ import com.dev.swms.server.utils.DateUtil; import com.dev.swms.server.utils.DoubleUtils; import com.dev.swms.server.utils.ServerUnreachableException; import com.dev.swms.server.utils.XMLUtils; -import com.dev.swms.server.web.filter.WarehouseHolder; import com.dev.energy.server.exception.BusinessException; import com.dev.energy.server.model.EntityFactory; import com.dev.energy.server.service.pojo.DefaultBaseManager; -import com.dev.energy.server.web.security.UserHolder; public class DefaultInterfaceItemManager extends DefaultBaseManager implements InterfaceItemManager { @@ -1125,7 +1122,6 @@ public class DefaultInterfaceItemManager extends DefaultBaseManager implements /** * 发送生效订单反馈接口内容 - * @param avaliableOrders * @return */ private void pushAvaliableOrderResponse(InterfaceLog log, AvaliableOrderResponse aor) { @@ -1561,7 +1557,7 @@ public class DefaultInterfaceItemManager extends DefaultBaseManager implements PackageUnit packageUnit= item.getMinPackageUnit(); ptd.setItem(item); ptd.setPackageUnit(packageUnit); - ptd.setLineNumber(i.getLineNumber()); + ptd.setLineNumber(Integer.parseInt(i.getLineNumber())); ptd.setOrderQuantity(Double.parseDouble(i.getUnitsTransactionQty())); if(!item.isBeMarkWeight()){ System.out.println(item.getCode()); diff --git a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java index 89f1b04..ea7d61b 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java @@ -100,7 +100,6 @@ public interface ASNManager extends BaseManager{ * @param asnDetailId 收货明细ID; * @param lotInfo 批次属性 * @param quantity 收货数量 - * @param receivingPackageUnit 收货包装ID * @param receiveDate 收货日期; * @param qualityCode 质损代码; * @param workerId 作业人员; @@ -148,7 +147,6 @@ public interface ASNManager extends BaseManager{ /** * RF方法－根据指定收货单的货品编码查找对应的收货单明细 - * @param docId * @param itemCode * @param type 0-返回找到的第一条单据明细 * 1-返回找到的第一条未完成收货确认的单据明细 @@ -214,8 +212,6 @@ public interface ASNManager extends BaseManager{ /** * 根据ASN号或取ASN收货信息 - * @param code - * @param userId * @return */ diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java index f44845f..5ec65c3 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java @@ -54,7 +54,6 @@ import com.dev.swms.server.model.base.LotInfo; import com.dev.swms.server.model.base.PackageUnit; import com.dev.swms.server.model.base.SignFile; import com.dev.swms.server.model.base.Structure; -import com.dev.swms.server.model.base.Warehouse; import com.dev.swms.server.model.base.Worker; import com.dev.swms.server.model.fee.Fee; import com.dev.swms.server.model.interfaces.InterfaceWmsDownload; @@ -92,9 +91,7 @@ import com.dev.swms.server.service.sequence.BussinessCodeManager; import com.dev.swms.server.service.shipping.PickTicketManager; import com.dev.swms.server.utils.DateUtil; import com.dev.swms.server.utils.DoubleUtils; -import com.dev.swms.server.utils.HttpRequest; import com.dev.swms.server.web.filter.WarehouseHolder; -import com.sun.org.apache.bcel.internal.generic.SIPUSH; /** * @author dev @@ -570,7 +567,6 @@ public class DefaultASNManager extends DefaultBaseManager implements ASNManager * @param location * @param receiveQty * (基本单位数量) - * @param LP */ private ReceivedRecord receive(ASN asn, ASNDetail asnDetail, diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java index b503582..3ac8ee2 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java @@ -20,15 +20,12 @@ import java.util.Map.Entry; import jxl.Sheet; import jxl.Workbook; import jxl.read.biff.BiffException; -import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.springframework.transaction.annotation.Transactional; -import com.alibaba.fastjson.JSON; import com.dev.swms.client.ui.constant.CT_PA; import com.dev.swms.client.ui.javabean.PT_ALLOCATED; import com.dev.swms.client.ui.javabean.PT_AVAILABLE; @@ -78,7 +75,6 @@ import com.dev.swms.server.model.shipping.PickTicketStatus; import com.dev.swms.server.model.shipping.PreAllocate; import com.dev.swms.server.model.shipping.Prewave; import com.dev.swms.server.model.shipping.ProductPackageUnit; -import com.dev.swms.server.model.shipping.ShipmentType; import com.dev.swms.server.model.shipping.WaveDocStatus; import com.dev.swms.server.service.GlobalParamUtils; import com.dev.swms.server.service.base.ItemManager; @@ -93,7 +89,6 @@ import com.dev.swms.server.service.shipping.PickTicketManager; import com.dev.swms.server.service.task.AllocateManager; import com.dev.swms.server.utils.DateUtil; import com.dev.swms.server.utils.DoubleUtils; -import com.dev.swms.server.utils.HttpRequest; import com.dev.swms.server.utils.NewLotInfoParser; import com.dev.swms.server.web.filter.WarehouseHolder; import com.dev.energy.client.ui.page.IPage; @@ -744,7 +739,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements /** * 按单包箱, 创建Package及其对应的PackageDetail(手工录入) * @param boxModel - * @param taskLogs + * @param pickedQuantity * @param bol */ public void manualCreatePackageFollowASN(BoxModel boxModel, Map pickedQuantity, BOL bol) { @@ -2670,7 +2665,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements for (int i = 5; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); - xhs.add(xh); + if(StringUtils.isNotEmpty(xh)){ + xhs.add(xh); + } } //判断序号是否有重复 @@ -2772,7 +2769,10 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); - xhs.add(xh); + if(StringUtils.isNotEmpty(xh)){ + xhs.add(xh); + } + } //判断序号是否有重复 @@ -2885,7 +2885,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); - xhs.add(xh); + if(StringUtils.isNotEmpty(xh)){ + xhs.add(xh); + } } //判断序号是否有重复 @@ -2998,7 +3000,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); - xhs.add(xh); + if(StringUtils.isNotEmpty(xh)){ + xhs.add(xh); + } } //判断序号是否有重复