huojin
/
jrwms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-11-19 10:55:32 +08:00
parent 2982241f7f
commit d24056f050
9 changed files with 78 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/dev/swms/server/model/shipping/PickTicketDetail.java
View File

@ -74,7 +74,7 @@ public class PickTicketDetail extends AbstractMoveDocDetail {
private double weight;//重量--净重
/** 行号*/
private String lineNumber;
private Integer lineNumber;
private double realWeight;//实发重量--毛重
@ -161,14 +161,12 @@ public class PickTicketDetail extends AbstractMoveDocDetail {
}
public String getLineNumber() {
public Integer getLineNumber() {
return lineNumber;
}
public void setLineNumber(String lineNumber) {
public void setLineNumber(Integer lineNumber) {
this.lineNumber = lineNumber;
}
public double getVolume() {
return volume;
}

2
src/main/java/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml
View File

@ -64,7 +64,7 @@
<property name="storageDate" column="STORAGE_DATE" type="date"/>
<property name="SOI" column="SOI" type="string"/>
<property name="caCoefficient" column="CA_COEFFICIENT" type="double"/>
<property name="lineNumber" column="LINE_NUMBER" type="string" length="100"/>
<property name="lineNumber" column="LINE_NUMBER" type="integer" length="100"/>
<property name="volume" column="VOLUME" type="double" />
<property name="weight" column="WEIGHT" type="double" />
<property name="realWeight" column="REAL_WEIGHT" type="double" />

11
src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
View File

@ -225,15 +225,12 @@ public class DefaultASNManager extends DefaultBaseManager implements ASNManager
}
public Integer getlineNo(ASN asn){
List<ASNDetail> ASNDetails= commonDao.findByQuery("from ASNDetail ad where ad.asn.id=:id order by ad.lineNo desc ",
List<Integer> list= commonDao.findByQuery("select max(ad.lineNo) from ASNDetail ad where ad.asn.id=:id ",
new String[] { "id"},new Object[] {asn.getId() });
Integer count=0;
if(ASNDetails.size()<=0){
count=0;
}else{
count=ASNDetails.get(0).getLineNo();
if(list.get(0)==null){
return 0;
}
return count;
return list.get(0);
}
public void refreshweightandvolume(Long id) {

80
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
View File

@ -2018,9 +2018,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
pickTicket.addPickTicketDetail(planPickTicketDetail);
Integer lineNo=getlineNo(pickTicket);
if(lineNo==0){
planPickTicketDetail.setLineNumber("1");
planPickTicketDetail.setLineNumber(1);
}else{
planPickTicketDetail.setLineNumber(String.valueOf(lineNo+1));
planPickTicketDetail.setLineNumber((lineNo+1));
}
commonDao.store(planPickTicketDetail);
if(item.getCompany().getId()==1003){
@ -2055,15 +2055,11 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
}
public Integer getlineNo(PickTicket pt){
List<PickTicketDetail> pickTicketDetail= commonDao.findByQuery("from PickTicketDetail ptd where ptd.pickTicket.id=:id order by ptd.lineNumber desc ",
new String[] { "id"},new Object[] {pt.getId() });
Integer count=0;
if(pickTicketDetail.size()<=0){
count=0;
}else{
count=Integer.parseInt(pickTicketDetail.get(0).getLineNumber()==null?"1":pickTicketDetail.get(0).getLineNumber());
List<Integer> list= commonDao.findByQuery("select max(ptd.lineNumber) from PickTicketDetail ptd where ptd.pickTicket.id="+pt.getId()+" ");
if(list.get(0)==null){
return 0;
}
return count;
return list.get(0);
}
public void shauxinInvQty(long itemId){
@ -2670,6 +2666,20 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
workbook = Workbook.getWorkbook(file);
Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容
PickTicket pt=EntityFactory.getEntity(PickTicket.class);
List<String> xhs=new ArrayList<String>();
for (int i = 5; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
xhs.add(xh);
}
//判断序号是否有重复
HashSet<String> set = new HashSet<String>(xhs);
if (xhs.size() > set.size()) {
throw new BusinessException("导入的文件中序号有重复请调整");
}
for (int i = 5; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
String barcode = sheet.getCell(1, i).getContents().trim();
@ -2728,7 +2738,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
ptd.setOrderQuantity(Double.parseDouble(quantity));
ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity));
ptd.setPackageUnit(packageUnit);
ptd.setLineNumber(xh);
ptd.setLineNumber(Integer.parseInt(xh));
commonDao.store(ptd);
Refresh(pt.getId());// 刷新
System.out.println((i+1));
@ -2758,6 +2768,20 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
//序号 品番 中文名 英文名 数量
Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容
PickTicket pt=EntityFactory.getEntity(PickTicket.class);
List<String> xhs=new ArrayList<String>();
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
xhs.add(xh);
}
//判断序号是否有重复
HashSet<String> set = new HashSet<String>(xhs);
if (xhs.size() > set.size()) {
throw new BusinessException("导入的文件中序号有重复请调整");
}
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
String code = sheet.getCell(1, i).getContents().trim();
@ -2828,7 +2852,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
ptd.setOrderQuantity(Double.parseDouble(quantity));
ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity));
ptd.setPackageUnit(packageUnit);
ptd.setLineNumber(xh);
ptd.setLineNumber(Integer.parseInt(xh));
commonDao.store(ptd);
Refresh(pt.getId());// 刷新
System.out.println((i+1));
@ -2857,6 +2881,19 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
//序号 品番 中文名 英文名 数量
Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容
PickTicket pt=EntityFactory.getEntity(PickTicket.class);
List<String> xhs=new ArrayList<String>();
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
xhs.add(xh);
}
//判断序号是否有重复
HashSet<String> set = new HashSet<String>(xhs);
if (xhs.size() > set.size()) {
throw new BusinessException("导入的文件中序号有重复请调整");
}
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
String code = sheet.getCell(1, i).getContents().trim();
@ -2927,7 +2964,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
ptd.setOrderQuantity(Double.parseDouble(quantity));
ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity));
ptd.setPackageUnit(packageUnit);
ptd.setLineNumber(xh);
ptd.setLineNumber(Integer.parseInt(xh));
commonDao.store(ptd);
Refresh(pt.getId());// 刷新
System.out.println((i+1));
@ -2957,6 +2994,19 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
//序号 品番 中文名 英文名 数量
Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容
PickTicket pt=EntityFactory.getEntity(PickTicket.class);
List<String> xhs=new ArrayList<String>();
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
xhs.add(xh);
}
//判断序号是否有重复
HashSet<String> set = new HashSet<String>(xhs);
if (xhs.size() > set.size()) {
throw new BusinessException("导入的文件中序号有重复请调整");
}
for (int i = 8; i < sheet.getRows(); i++) {
String xh = sheet.getCell(0, i).getContents().trim();
String code = sheet.getCell(1, i).getContents().trim();
@ -3027,7 +3077,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
ptd.setOrderQuantity(Double.parseDouble(quantity));
ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity));
ptd.setPackageUnit(packageUnit);
ptd.setLineNumber(xh);
ptd.setLineNumber(Integer.parseInt(xh));
commonDao.store(ptd);
Refresh(pt.getId());// 刷新
System.out.println((i+1));
@ -3465,7 +3515,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
asnDetail.setExpectedQuantity(ptd.getOrderQuantity());
asnDetail.setExpectedQtyOfMasterUnit(ptd.getOrderQuantity());
asnDetail.setPackageUnit(ptd.getPackageUnit());
asnDetail.setLineNo(Integer.parseInt(ptd.getLineNumber()));
asnDetail.setLineNo(ptd.getLineNumber());
asnDetail.setCaCoefficient(ptd.getItem().getCAcoefficient() == null ? 0: ptd.getItem().getCAcoefficient());
asnDetail.setDock(ptd.getItem().getLocation());
commonDao.store(asnDetail);

4
src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml
View File

@ -60,6 +60,7 @@
<detail autoQuery="false">
<datasource><![CDATA[SELECT
asnDetail.id,
asnDetail.lineNo,
item.barcode,
item.strExtend3,
item.code,
@ -92,9 +93,10 @@
left join asnDetail.dock
WHERE 1=1
/~asn.id: AND asnDetail.asn.id = {asn.id} ~/
ORDER BY asnDetail.id desc ,asnDetail.PO, asnDetail.lineNo ASC]]></datasource>
ORDER BY asnDetail.id ]]></datasource>
<columns>
<column id="asnDetail.id" title="asnDetail.id" visible="false"/>
<column id="asnDetail.lineNo" title="序号" visible="true" horizonAlign="left"/>
<column id="item.barcode" title="货品条码" visible="true" horizonAlign="left"/>
<column id="item.strExtend3" title="外条码" visible="true" horizonAlign="left"/>
<column id="asnDetail.item.code" title="item.code" visible="true" horizonAlign="left"/>

2
src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
View File

@ -62,6 +62,7 @@
<detail autoQuery="false">
<datasource><![CDATA[SELECT
pickTicketDetail.id,
pickTicketDetail.lineNumber,
pickTicketDetail.item.barcode,
pickTicketDetail.item.strExtend3,
pickTicketDetail.item.code,
@ -94,6 +95,7 @@ case
order by pickTicketDetail.id asc]]></datasource>
<columns>
<column id="pickTicketDetail.id" title="ID" visible="false"/>
<column id="pickTicketDetail.lineNumber" width="50" title="序号" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.barcode" width="100" title="货品条码" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.strExtend3" width="100" title="外条码" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.code" title="item.code" visible="true" horizonAlign="center"/>

117
target/jrwms/WEB-INF/classes/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml
View File

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE hibernate-mapping PUBLIC
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
<hibernate-mapping>
<class name="com.dev.swms.server.model.shipping.PickTicketDetail" table="PICK_TICKET_DETAIL">
<id name="id" column="ID" type="long">
<generator class="native">
<param name="sequence">wms_pickTicketDetail</param>
<param name="parameters">START WITH 1000</param>
</generator>
</id>
<discriminator column="DISCRIMINATOR" type="string"/>
<many-to-one name="pickTicket" class="com.dev.swms.server.model.shipping.PickTicket">
<column name="PICK_TICKET_ID"/>
</many-to-one>
<many-to-one name="item" class="com.dev.swms.server.model.base.Item">
<column name="ITEM_ID" not-null="true"/>
</many-to-one>
<component name="newLotInfo" class="com.dev.swms.server.model.base.NewLotInfo">
<property name="propC1" type="string" column="PROP_C1" length="100"/>
<property name="propC2" type="string" column="PROP_C2" length="100"/>
<property name="propC3" type="string" column="PROP_C3" length="100"/>
<property name="propC4" type="string" column="PROP_C4" length="100"/>
<property name="propC5" type="string" column="PROP_C5" length="100"/>
<property name="propC6" type="string" column="PROP_C6" length="100"/>
<property name="propC7" type="string" column="PROP_C7" length="100"/>
<property name="propC8" type="string" column="PROP_C8" length="100"/>
<property name="propC9" type="string" column="PROP_C9" length="100"/>
<property name="propN1" type="string" column="PROP_N1" length="100"/>
<property name="propN2" type="string" column="PROP_N2" length="100"/>
<property name="propN3" type="string" column="PROP_N3" length="100"/>
<property name="propD1" type="string" column="PROP_D1" length="100"/>
<property name="propD2" type="string" column="PROP_D2" length="100"/>
<property name="propD3" type="string" column="PROP_D3" length="100"/>
<property name="propL1" type="string" column="PROP_L1" length="100"/>
<property name="propL2" type="string" column="PROP_L2" length="100"/>
<property name="propL3" type="string" column="PROP_L3" length="100"/>
</component>
<property name="orderQuantity" type="double" column="ORDER_QUANTITY"/>
<property name="orderQtyOfMasterUnit" type="double" column="ORDER_QUANTITY_MU"/>
<property name="preAllocatedQuantity" type="double" column="PRE_ALLOCATED_QTY"/>
<property name="preAllocatedLot" type="string" length="20" column="PRE_ALLOCATED_LOT"/>
<property name="allocatedQuantity" type="double" column="ALLOCATED_QUANTITY"/>
<property name="pickedQuantity" type="double" column="PICKED_QUANTITY"/>
<property name="shippedQuantity" type="double" column="SHIPPED_QUANTITY"/>
<many-to-one name="packageUnit" class="com.dev.swms.server.model.base.PackageUnit">
<column name="PACKAGE_UNIT_ID" not-null="true"/>
</many-to-one>
<set name="tasks" lazy="true" inverse="true" cascade="all-delete-orphan">
<key column="PICK_TICKET_DETAIL_ID"/>
<one-to-many class="com.dev.swms.server.model.inventory.Task"/>
</set>
<property name="packageQuantity" type="double" column="PACKAGE_QUANTITY"/>
<property name="BOLQuantity" type="double" column="BOL_QUANTITY"/>
<property name="locType" column="loc_Type" type="string" length="50"/>
<property name="applyDoc" column="APPLY_DOC" type="string" length="50"/>
<property name="applyDocDetailId" column="APPLY_DOC_DETAIL_ID" type="long"/>
<property name="oldRecord" column="OLD_RECORD" type="boolean"/>
<property name="storageDate" column="STORAGE_DATE" type="date"/>
<property name="SOI" column="SOI" type="string"/>
<property name="caCoefficient" column="CA_COEFFICIENT" type="double"/>
<property name="lineNumber" column="LINE_NUMBER" type="string" length="100"/>
<property name="volume" column="VOLUME" type="double" />
<property name="weight" column="WEIGHT" type="double" />
<property name="realWeight" column="REAL_WEIGHT" type="double" />
<property name="rejectQuantity" column="REJECT_QUANTITY" type="double" />
<property name="rejectZTQuantity" column="REJECTZT_QUANTITY" type="double" />
<property name="norejectQuantity" column="NOREJECT_QUANTITY" type="double" />
<property name="norejectZTQuantity" column="NOREJECTZT_QUANTITY" type="double" />
<property name="kcQty" formula="(select (select COALESCE(sum(i.QUANTITY-i.QUEUED_QUANTITY),0) from INVENTORY i left join ITEM_KEY_INVENTORY iki on iki.id=i.ITEM_KEY_INVENTORY_ID left join ITEM_KEY ik on ik.id=iki.ITEM_KEY_ID where ik.ITEM_ID=ITEM_ID and iki.WAREHOUSE_ID=pt.WAREHOUSE_ID and ik.PROP_D1=PROP_D1 and ik.PROP_D2=PROP_D2 ) from PICK_TICKET pt where pt.id=PICK_TICKET_ID )" />
<property name="invStatus" column="inv_Status" type="string" length="250"/>
<property name="note" column="note" type="string" length="250"/>
</class>
<query name="getPickTicketDetailsCountByItemID">
<![CDATA[SELECT COUNT(detail) FROM PickTicketDetail detail WHERE detail.item.id = :itemId]]>
</query>
<query name="getPickTicketDetailsCountByPackageUnitId">
<![CDATA[SELECT COUNT(detail) FROM PickTicketDetail detail WHERE detail.packageUnit.id = :packageUnitId]]>
</query>
<query name="getPickTicketDetailsByPickTicket">
<![CDATA[FROM PickTicketDetail detail WHERE detail.pickTicket = :pickTicket]]>
</query>
<query name="getPickticketDetailForMustWaveWorkByWaveModel">
<![CDATA[FROM PickTicketDetail detail
WHERE detail.pickTicket.warehouse.id=:warehouseId
AND detail.item.id = :itemId
AND detail.pickTicket.waveCode = :waveCode
AND detail.pickTicket.status<>'PICK_ALL'
]]>
</query>
<query name="getPickticketDetailForMustWaveWorkByPickticketModel">
<![CDATA[FROM PickTicketDetail detail
WHERE detail.pickTicket.warehouse.id=:warehouseId
AND detail.item.id = :itemId
AND detail.pickTicket.id in (:pickTicketIds)
AND detail.pickTicket.waveCode = :waveCode
AND detail.pickTicket.status<>'PICK_ALL'
]]>
</query>
<query name="getPickticketDetailsByItemId">
<![CDATA[FROM PickTicketDetail detail
WHERE detail.pickTicket.status in ('ACTIVE','ALLOCATE','PICKUP','SHIP_PART')
AND detail.pickTicket.crossStocking = true
AND detail.pickTicket.waveCode is null
AND detail.orderQtyOfMasterUnit-allocatedQuantity > 0
AND detail.pickTicket.warehouse.id = :warehouseId
AND detail.item.id = :itemId
]]>
</query>
</hibernate-mapping>

138
target/jrwms/WEB-INF/classes/config/origen/receiving/editASNPage.xml
View File

@ -1,138 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<modifyDetailPage id="editASNPage" title="editASNPage" entityClass="com.dev.swms.server.model.receiving.ASN" onClose="refreshParent" width="950" height="540">
<modify>
<inputUIs>
<hidden id="asn.status" reserve="false"/>
<hidden id="asn.version" reserve="false"/>
<hidden id="asn.id" reserve="false"/>
<list id="asn.company.id" title="asn.company" row="1" col="1" span="1" width="200" readOnly="false" required="true" reserve="false" forceOverride="true">
<hql><![CDATA[select company.id, company.name from Structure company
where company.beCompany = true
and company.disabled=false
and company.warehouse = #{SESSION_WAREHOUSE}
]]></hql>
</list>
<text id="asn.code" title="asn.code" row="1" col="2" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="true"/>
<text id="asn.relatedBill1" title="CustomerOrderNumber" row="1" col="2" width="400" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="true"/>
<list id="asn.billType.id" title="asn.billType" row="1" col="4" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true">
<hql><![CDATA[select billType.id,billType.name
from BillType billType
where 1=1
and billType.disabled=false
and billType.type='RECEIVE'
order by billType.id
]]></hql>
</list>
<text id="asn.expectedQuantity" title="asn.expectedQuantity" row="2" col="1" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="true"/>
<date id="asn.orderDate" title="asn.orderDate" row="2" col="2" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="true"/>
<text id="asn.fromName" title="收货方" row="2" col="3" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
<list id="asn.shipmentType" title="StorageType" row="2" col="4" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" enumType="ShipmentType" defaultValue="LOGISTICS">
<hql><![CDATA[ SELECT
enumerate.enumValue,
enumerate.enumValue From Enumerate enumerate
where enumerate.enumType = 'ShipmentType']]></hql>
<!-- <eventListeners>
<eventListener id="cc" refreshUI="true"/>
</eventListeners> -->
</list>
<text id="asn.description" title="asn.description" row="3" col="1" span="4" width="800" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
</inputUIs>
<buttons>
<commit id="save" title="save" enableType="none" invisible="false">
<enableExpression><![CDATA[${asn.status} == 'OPEN']]></enableExpression>
<mappings>
<mapping id="asn" className="com.dev.swms.server.model.receiving.asn"/>
</mappings>
<actions>
<action managerName="asnManager" methodName="storeASN" parameter="asn"/>
</actions>
<forwards>
<forward name="refreshParent" newEnabled="true" editEnabled="true"/>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
</buttons>
</modify>
<detail autoQuery="false">
<datasource><![CDATA[SELECT
asnDetail.id,
item.barcode,
item.strExtend3,
item.code,
item.name,
item.specs,
case when company.id!=1003 then
case when asnDetail.expectedQuantity=0 then ' '
when item.CAcoefficient=0 then (mod(asnDetail.expectedQuantity,item.CAcoefficient)||pu.unit)
when asnDetail.expectedQuantity<item.CAcoefficient then 0
when mod(asnDetail.expectedQuantity,item.CAcoefficient)=0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient))
when mod(asnDetail.expectedQuantity,item.CAcoefficient)>0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(asnDetail.expectedQuantity,item.CAcoefficient)||pu.unit) end
else
case when asnDetail.expectedQuantity=0 then ' '
when item.CAcoefficient=0 then (mod(asnDetail.expectedQuantity,item.CAcoefficient))
when asnDetail.expectedQuantity<item.CAcoefficient then 0
when mod(asnDetail.expectedQuantity,item.CAcoefficient)=0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient))
when mod(asnDetail.expectedQuantity,item.CAcoefficient)>0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient)) end
end ,
asnDetail.dock.code,
item.CAname,
CAST(asnDetail.expectedQuantity as integer),
pu.unit,
CAST(asnDetail.receivedQuantity as integer),
asnDetail.lotInfo.propD1,
asnDetail.lotInfo.propD2
FROM ASNDetail asnDetail
left join asnDetail.item item
left join asnDetail.item.company as company
left join asnDetail.packageUnit pu
left join asnDetail.dock
WHERE 1=1
/~asn.id: AND asnDetail.asn.id = {asn.id} ~/
ORDER BY asnDetail.id desc ,asnDetail.PO, asnDetail.lineNo ASC]]></datasource>
<columns>
<column id="asnDetail.id" title="asnDetail.id" visible="false"/>
<column id="item.barcode" title="货品条码" visible="true" horizonAlign="left"/>
<column id="item.strExtend3" title="外条码" visible="true" horizonAlign="left"/>
<column id="asnDetail.item.code" title="item.code" visible="true" horizonAlign="left"/>
<column id="asnDetail.item.name" title="item.name" visible="true" horizonAlign="left"/>
<column id="asnDetail.item.specs" title="item.specs" visible="true" horizonAlign="left"/>
<column id="a" title="销售单位数" width="100" visible="true" horizonAlign="right"/>
<column id="asnDetail.dock.code" title="库位" width="100" visible="true" horizonAlign="right"/>
<column id="item.CAname" title="销售单位" width="80" visible="true" horizonAlign="center"/>
<column id="asnDetail.expectedQuantity" title="包装规格数" width="80" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="pu.unit" title="包装单位" width="80" visible="true" horizonAlign="center"/>
<column id="asnDetail.receivedQuantity" width="85" title="asnDetail.receivedQuantity" visible="true" horizonAlign="right"/>
<column id="asnDetail.lotInfo.propD1" width="100" title="生产日期" visible="true" horizonAlign="left"/>
<column id="asnDetail.lotInfo.propD2" width="100" title="到期日期" visible="true" horizonAlign="left"/>
</columns>
<buttons>
<popup id="newDetail" title="newDetail" enableType="none" invisible="false" containId="false" pageId="editASNDetailPage">
<enableExpression><![CDATA[${asn.status} == 'OPEN']]></enableExpression>
</popup>
<popup id="modify" title="modifyDetail" enableType="single" invisible="false" containId="true" pageId="editASNDetailPage">
<enableExpression><![CDATA[${asn.status} == 'OPEN']]></enableExpression>
</popup>
<commit id="deleteDetail" title="deleteDetail" enableType="multi" invisible="false" confirmMessage="editReceivingDocPage.confirm.delete">
<enableExpression><![CDATA[${asn.status} == 'OPEN']]></enableExpression>
<mappings>
<mapping id="asn.id" className="long"/>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="asnManager" methodName="removeASNDetail" parameter="asn.id,ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
<popup id="lookStocks" title="lookStock" enableType="none" invisible="false" containId="false" pageId="maintainLookStockPage">
</popup>
</buttons>
</detail>
</modifyDetailPage>
</pages>

145
target/jrwms/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml
View File

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<modifyDetailPage id="editPickTicketPage" title="editPickTicketPage" entityClass="com.dev.swms.server.model.shipping.PickTicket" onClose="refreshParent" width="950" height="580">
<initListeners>
<initListener id="companyBePackagedFollowASN" managerName="pickTicketManager" methodName="getBePackagedFollowASN" newEnabled="false" editEnabled="true"/>
</initListeners>
<modify>
<inputUIs>
<hidden id="aa" reserve="false"/>
<hidden id="pickTicket.status" reserve="false"/>
<hidden id="pickTicket.version" reserve="false"/>
<hidden id="pickTicket.id" reserve="false"/>
<hidden id="companyBePackagedFollowASN" reserve="false"/>
<text id="pickTicket.code" title="pickTicket.code" row="1" col="1" readOnly="true" required="false" reserve="false" forceOverride="false" inVisible="false" length="20" trimSpace="true"/>
<text id="pickTicket.relatedBill1" title="CustomerOrderNumber" row="1" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="true"/>
<date id="pickTicket.orderDate" title="pickTicket.orderDate" row="1" col="3" readOnly="false" required="true" reserve="false" forceOverride="false" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="true"/>
<list id="pickTicket.billType.id" title="0013D4FC457C1188956282812" row="1" col="4" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true">
<hql><![CDATA[SELECT
billType.id,
billType.name
FROM BillType billType
WHERE 1=1
AND billType.disabled = false
AND billType.type = 'SHIP'
]]></hql>
</list>
<list id="pickTicket.company.id" title="发货单位" row="2" col="1" span="1" width="200" readOnly="false" required="true" reserve="false" forceOverride="true">
<hql><![CDATA[select company.id, company.name from Structure company
where company.beCompany = true
and company.disabled=false
and company.warehouse = #{SESSION_WAREHOUSE}
]]></hql>
</list>
<text id="pickTicket.driverName" title="联系人" row="2" col="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" length="20" trimSpace="true"/>
<text id="pickTicket.lictrailer" title="联系方式" row="2" col="4" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" length="20" trimSpace="true"/>
<text id="pickTicket.shipToName" title="收货单位" row="3" col="1" span="2" width="360" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" length="100" trimSpace="true"/>
<text id="pickTicket.shipToContact.person" title="contact.person" row="3" col="3" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" length="20" trimSpace="true"/>
<text id="pickTicket.shipToContact.telephone" title="contact.telephone" row="3" col="4" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" length="50" trimSpace="true"/>
<text id="pickTicket.shipToAddress.address" title="address.address" row="4" col="1" span="4" width="750" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
<text id="pickTicket.description" title="pickTicket.description" row="5" col="1" span="4" width="750" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
</inputUIs>
<buttons>
<commit id="save" title="save" enableType="none" invisible="false">
<enableExpression><![CDATA[${pickTicket.status} !='CLOSE']]></enableExpression>
<mappings>
<mapping id="pickTicket" className="com.dev.swms.server.model.shipping.PickTicket"/>
<mapping id="pickTicket.store.id" className="long"/>
</mappings>
<actions>
<action managerName="pickTicketManager" methodName="storePickTicket" parameter="pickTicket,pickTicket.store.id"/>
</actions>
<forwards>
<forward name="refreshParent" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
</buttons>
</modify>
<detail autoQuery="false">
<datasource><![CDATA[SELECT
pickTicketDetail.id,
pickTicketDetail.item.barcode,
pickTicketDetail.item.strExtend3,
pickTicketDetail.item.code,
pickTicketDetail.item.name,
pickTicketDetail.item.specs,
case
when pickTicketDetail.orderQuantity=0 then ' '
when item.CAcoefficient=0 then (mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit)
when pickTicketDetail.orderQuantity<item.CAcoefficient then 0
when mod(pickTicketDetail.orderQuantity,item.CAcoefficient)=0 then (floor(pickTicketDetail.orderQuantity/item.CAcoefficient))
when mod(pickTicketDetail.orderQuantity,item.CAcoefficient)>0 then (floor(pickTicketDetail.orderQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit) end, item.CAname,
CAST(pickTicketDetail.orderQuantity as integer),
pu.unit,
item.location.code,
pickTicketDetail.newLotInfo.propD1,
pickTicketDetail.newLotInfo.propD2,
CAST(pickTicketDetail.preAllocatedQuantity as integer),
CAST(pickTicketDetail.allocatedQuantity as integer),
CAST(pickTicketDetail.pickedQuantity as integer),
CAST(pickTicketDetail.shippedQuantity as integer),
pu.unit as bzdw,
CAST(pickTicketDetail.kcQty as integer),
pu.unit as kcbzdw
FROM PickTicketDetail pickTicketDetail
left join pickTicketDetail.packageUnit pu
left join pickTicketDetail.item item
left join item.location
WHERE 1=1
/~pickTicket.id: AND pickTicketDetail.pickTicket.id = {pickTicket.id}~/
order by pickTicketDetail.id asc]]></datasource>
<columns>
<column id="pickTicketDetail.id" title="ID" visible="false"/>
<column id="pickTicketDetail.item.barcode" width="100" title="货品条码" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.strExtend3" width="100" title="外条码" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.code" title="item.code" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.name" title="item.name" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.item.specs" width="100" title="item.specs" visible="true" horizonAlign="center"/>
<column id="xsdws" title="销售单位数" width="80" visible="true" horizonAlign="center"/>
<column id="item.CAname" title="销售单位" width="80" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.orderQuantity" width="90" title="包装规格数" visible="true" horizonAlign="center"/>
<column id="pu.unit" title="包装单位" width="80" visible="true" horizonAlign="center"/>
<column id="item.location.code" title="库位" width="80" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.newLotInfo.propD1" title="生产日期" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.newLotInfo.propD2" title="到期日期" visible="true" horizonAlign="center" />
<column id="pickTicketDetail.preAllocatedQuantity" width="90" title="pickTicketDetail.preAllocatedQuantity" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.allocatedQuantity" width="90" title="pickTicketDetail.allocatedQuantity" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.pickedQuantity" width="90" title="pickTicketDetail.pickedQuantity" visible="true" horizonAlign="center" verticalAlign="middle"/>
<column id="pickTicketDetail.shippedQuantity" width="90" title="pickTicketDetail.shippedQuantity" visible="true" horizonAlign="center"/>
<column id="bzdw" width="90" title="包装单位" visible="true" horizonAlign="center"/>
<column id="pickTicketDetail.kcQty" width="120" title="库存包装剩余数量" visible="true" horizonAlign="center"/>
<column id="kcbzdw" width="90" title="库存包装单位" visible="true" horizonAlign="center"/>
</columns>
<buttons>
<popup id="newDetail" title="newDetail" enableType="none" invisible="false" containId="false" pageId="editPickTicketDetailPage">
<enableExpression><![CDATA[${pickTicket.status} == 'OPEN']]></enableExpression>
</popup>
<popup id="modifyDetail" title="modifyDetail" enableType="single" invisible="false" containId="true" pageId="editPickTicketDetailPage">
<enableExpression><![CDATA[${pickTicket.status} == 'OPEN']]></enableExpression>
</popup>
<commit id="deleteDetail" title="deleteDetail" enableType="multi" invisible="false" confirmMessage="title1168830577781">
<enableExpression><![CDATA[${pickTicket.status} == 'OPEN']]></enableExpression>
<mappings>
<mapping id="pickTicket.id" className="long"/>
<mapping id="ids" className="list"/>
</mappings>
<actions>
<action managerName="pickTicketManager" methodName="removePlanPickTicketDetail" parameter="pickTicket.id,ids"/>
</actions>
<forwards>
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
</forwards>
</commit>
<popup id="lookStock" title="lookStock" enableType="none" invisible="false" containId="false" pageId="maintainLookStockPage">
</popup>
<popup id="tsModifyDetail" title="tsModifyDetail" enableType="single" invisible="false" containId="true" pageId="editTsPickTicketDetailPage">
</popup>
</buttons>
</detail>
</modifyDetailPage>
</pages>