1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/ExportVView.java

@@ -275,5 +275,9 @@ public class ExportVView {
      * 出入库任务编号
      */
     private String inOutTaskNo;
+    /**
+     * 备注
+     */
+    private String remark;
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -552,7 +552,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                     stockSaleReceiptReport.setFeedbackDate(new Date());
                                     stockSaleReceiptReport.setFeedbackWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                     //按收货重量结算时
-                                    if("2".equals(contractManagementInfo.getSettlementWeightMethod())){
+                                    if("2".equals(contractManagementInfo.getSettlementWeightMethod())&&tranCarInfo.getUnloadNetWeight() > 0){
                                         stockSaleReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(tranCarInfo.getUnloadNetWeight())));
                                         //定价销售
                                         if(contractManagementInfo.getUnitContractPrice()!=null) {
@@ -571,7 +571,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         }
                                     }
                                     //按出库重量结算时
-                                    else{
+                                    else if("1".equals(contractManagementInfo.getSettlementWeightMethod())){
                                         //随行就市
                                         if(contractManagementInfo.getUnitContractPrice()==null) {
                                             stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(tranCarInfo.getContractPrice())));

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -3824,8 +3824,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(10, 12 * 256 + 184);
         sheet.setColumnWidth(11, 12 * 256 + 184);
         sheet.setColumnWidth(12, "客户".getBytes().length * 6 * 256);
-        sheet.setColumnWidth(13, "货名".getBytes().length * 3 * 256);
-        sheet.setColumnWidth(14, 12 * 256 + 184);
+        sheet.setColumnWidth(13, 12 * 256 + 184);
+        sheet.setColumnWidth(14, "货名".getBytes().length * 3 * 256);
         sheet.setColumnWidth(15, 12 * 256 + 184);
         sheet.setColumnWidth(16, 12 * 256 + 184);
         sheet.setColumnWidth(17, 12 * 256 + 184);
@@ -3846,8 +3846,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(32, 12 * 256 + 184);
         sheet.setColumnWidth(33, 12 * 256 + 184);
         sheet.setColumnWidth(34, 12 * 256 + 184);
-        sheet.setColumnWidth(35, "反馈日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(36, 12 * 256 + 184);
+        sheet.setColumnWidth(35, 12 * 256 + 184);
+        sheet.setColumnWidth(36, "反馈日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(37, 12 * 256 + 184);
         sheet.setColumnWidth(38, 12 * 256 + 184);
         sheet.setColumnWidth(39, 12 * 256 + 184);
@@ -3856,10 +3856,11 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         sheet.setColumnWidth(42, 12 * 256 + 184);
         sheet.setColumnWidth(43, 12 * 256 + 184);
         sheet.setColumnWidth(44, 12 * 256 + 184);
-        sheet.setColumnWidth(45, "收款日期".getBytes().length * 2 * 256);
-        sheet.setColumnWidth(46, 12 * 256 + 184);
+        sheet.setColumnWidth(45, 12 * 256 + 184);
+        sheet.setColumnWidth(46, "收款日期".getBytes().length * 2 * 256);
         sheet.setColumnWidth(47, 12 * 256 + 184);
-        sheet.setColumnWidth(48, 1 * 256 + 184);
+        sheet.setColumnWidth(48, 12 * 256 + 184);
+        sheet.setColumnWidth(49, 1 * 256 + 184);
 
         // 创建单元格对象
         HSSFCell cell = null;
@@ -3975,6 +3976,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellStyle(styleTitle);
         cell = row0.createCell(47);
         cell.setCellStyle(styleTitle);
+        cell = row0.createCell(48);
+        cell.setCellStyle(styleTitle);
         rownum++;
 
         Map<String, Object> pageView = new HashMap<>();
@@ -4056,27 +4059,27 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(15);
             cell.setCellStyle(styleDetail);
-            //水分平均值
             cell = rowp.createCell(16);
+            cell.setCellStyle(styleDetail);
+            //水分平均值
+            cell = rowp.createCell(17);
             cell.setCellStyle(contextstyle1);
             cell.setCellValue(waterContentTotal / netWeightTmp);
-            cell = rowp.createCell(17);
+            cell = rowp.createCell(18);
             cell.setCellValue(impurityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(18);
+            cell = rowp.createCell(19);
             cell.setCellValue(mildewGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(19);
+            cell = rowp.createCell(20);
             cell.setCellValue(imperfectGrainTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(20);
+            cell = rowp.createCell(21);
             cell.setCellValue(bulkDensityTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(21);
+            cell = rowp.createCell(22);
             cell.setCellValue(jiaorenliTotal / netWeightTmp);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(22);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(23);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(24);
@@ -4092,18 +4095,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(29);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(30);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(31);
             cell.setCellValue(dataList.size());
             cell.setCellStyle(styleDetail1);
-            cell = rowp.createCell(31);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(32);
             cell.setCellStyle(styleDetail);
-            //纯重合计
             cell = rowp.createCell(33);
+            cell.setCellStyle(styleDetail);
+            //纯重合计
+            cell = rowp.createCell(34);
             cell.setCellValue(netWeightTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(34);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(35);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(36);
@@ -4119,10 +4122,10 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell = rowp.createCell(41);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(42);
+            cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(43);
             cell.setCellValue(amountIngPayableTotal);
             cell.setCellStyle(contextstyle1);
-            cell = rowp.createCell(43);
-            cell.setCellStyle(styleDetail);
             cell = rowp.createCell(44);
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(45);
@@ -4131,6 +4134,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             cell.setCellStyle(styleDetail);
             cell = rowp.createCell(47);
             cell.setCellStyle(styleDetail);
+            cell = rowp.createCell(48);
+            cell.setCellStyle(styleDetail);
             rownum++;
         }
 
@@ -4174,108 +4179,111 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         cell.setCellValue("客户");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(13);
-        cell.setCellValue("货名");
+        cell.setCellValue("备注");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(14);
-        cell.setCellValue("类型");
+        cell.setCellValue("货名");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(15);
-        cell.setCellValue("等级");
+        cell.setCellValue("类型");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(16);
-        cell.setCellValue("水分");
+        cell.setCellValue("等级");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(17);
-        cell.setCellValue("杂质");
+        cell.setCellValue("水分");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(18);
-        cell.setCellValue("霉变粒");
+        cell.setCellValue("杂质");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(19);
-        cell.setCellValue("不完善粒");
+        cell.setCellValue("霉变粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(20);
-        cell.setCellValue("容重");
+        cell.setCellValue("不完善粒");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(21);
-        cell.setCellValue("热损伤");
+        cell.setCellValue("容重");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(22);
-        cell.setCellValue("车厢号");
+        cell.setCellValue("热损伤");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(23);
-        cell.setCellValue("箱号1");
+        cell.setCellValue("车厢号");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(24);
-        cell.setCellValue("箱号2");
+        cell.setCellValue("箱号1");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(25);
-        cell.setCellValue("封号1");
+        cell.setCellValue("箱号2");
         cell.setCellStyle(styleDetail);
         cell = row1.createCell(26);
+        cell.setCellValue("封号1");
+        cell.setCellStyle(styleDetail);
+        cell = row1.createCell(27);
         cell.setCellValue("封号2");
         cell.setCellStyle(contextstyle);
-        cell = row1.createCell(27);
+        cell = row1.createCell(28);
         cell.setCellValue("船名");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(28);
+        cell = row1.createCell(29);
         cell.setCellValue("航次");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(29);
+        cell = row1.createCell(30);
         cell.setCellValue("车牌号");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(30);
+        cell = row1.createCell(31);
         cell.setCellValue("车数");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(31);
+        cell = row1.createCell(32);
         cell.setCellValue("毛重(吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(32);
+        cell = row1.createCell(33);
         cell.setCellValue("皮重(吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(33);
+        cell = row1.createCell(34);
         cell.setCellValue("出库净重(吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(34);
+        cell = row1.createCell(35);
         cell.setCellValue("反馈重量(吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(35);
+        cell = row1.createCell(36);
         cell.setCellValue("反馈日期");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(36);
+        cell = row1.createCell(37);
         cell.setCellValue("结算重量(吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(37);
+        cell = row1.createCell(38);
         cell.setCellValue("结算单价(元/吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(38);
+        cell = row1.createCell(39);
         cell.setCellValue("汽运运费(元/吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(39);
+        cell = row1.createCell(40);
         cell.setCellValue("火运运费(元/吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(40);
+        cell = row1.createCell(41);
         cell.setCellValue("船运运费(元/吨)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(41);
+        cell = row1.createCell(42);
         cell.setCellValue("运费");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(42);
+        cell = row1.createCell(43);
         cell.setCellValue("应收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(43);
+        cell = row1.createCell(44);
         cell.setCellValue("已收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(44);
+        cell = row1.createCell(45);
         cell.setCellValue("未收金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(45);
+        cell = row1.createCell(46);
         cell.setCellValue("收款日期");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(46);
+        cell = row1.createCell(47);
         cell.setCellValue("已开票金额(元)");
         cell.setCellStyle(styleDetail);
-        cell = row1.createCell(47);
+        cell = row1.createCell(48);
         cell.setCellValue("状态");
         cell.setCellStyle(styleDetail);
         rownum++;
@@ -4328,126 +4336,129 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getCustomerName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(13);
-                cell.setCellValue(editString(exportVView.getGoodsName()));
+                cell.setCellValue(editString(exportVView.getRemark()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(14);
-                cell.setCellValue(editString(exportVView.getType()));
+                cell.setCellValue(editString(exportVView.getGoodsName()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(15);
-                cell.setCellValue(editString(exportVView.getGrade()));
+                cell.setCellValue(editString(exportVView.getType()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(16);
+                cell.setCellValue(editString(exportVView.getGrade()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(17);
                 if (!StringUtils.isEmpty(exportVView.getWaterContent())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getWaterContent()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(17);
+                cell = rowx.createCell(18);
                 if (!StringUtils.isEmpty(exportVView.getImpurity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImpurity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(18);
+                cell = rowx.createCell(19);
                 if (!StringUtils.isEmpty(exportVView.getMildewGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getMildewGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(19);
+                cell = rowx.createCell(20);
                 if (!StringUtils.isEmpty(exportVView.getImperfectGrain())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getImperfectGrain()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(20);
+                cell = rowx.createCell(21);
                 if (!StringUtils.isEmpty(exportVView.getBulkDensity())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getBulkDensity()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(21);
+                cell = rowx.createCell(22);
                 if (!StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     cell.setCellValue(Double.parseDouble(exportVView.getJiaorenli()));
                 }
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(22);
+                cell = rowx.createCell(23);
                 cell.setCellValue(editString(exportVView.getWingNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(23);
+                cell = rowx.createCell(24);
                 cell.setCellValue(editString(exportVView.getBoxNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(24);
+                cell = rowx.createCell(25);
                 cell.setCellValue(editString(exportVView.getBoxNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(25);
+                cell = rowx.createCell(26);
                 cell.setCellValue(editString(exportVView.getTitleNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(26);
+                cell = rowx.createCell(27);
                 cell.setCellValue(editString(exportVView.getTitleNoOther()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(27);
+                cell = rowx.createCell(28);
                 cell.setCellValue(editString(exportVView.getShipNumber()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(28);
+                cell = rowx.createCell(29);
                 cell.setCellValue(editString(exportVView.getShipName()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(29);
+                cell = rowx.createCell(30);
                 cell.setCellValue(editString(exportVView.getCarNo()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(30);
+                cell = rowx.createCell(31);
                 cell.setCellValue("1");
                 cell.setCellStyle(styleDetail);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle.setDataFormat(df.getBuiltinFormat("#,##0.00"));//保留两位小数点
                 HSSFDataFormat df1 = wb.createDataFormat(); // 此处设置数据格式
                 contextstyle1.setDataFormat(df1.getBuiltinFormat("#,##0.00"));//保留两位小数点
-                cell = rowx.createCell(31);
+                cell = rowx.createCell(32);
                 cell.setCellValue(editDouble(exportVView.getGrossWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(32);
+                cell = rowx.createCell(33);
                 cell.setCellValue(editDouble(exportVView.getTare()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(33);
+                cell = rowx.createCell(34);
                 cell.setCellValue(Double.parseDouble(exportVView.getNetWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(34);
+                cell = rowx.createCell(35);
                 cell.setCellValue(editFloat(exportVView.getFeedbackWeight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(35);
+                cell = rowx.createCell(36);
                 String date1 = addDateOneDay(exportVView.getFeedbackDate() != null ? exportVView.getFeedbackDate() : new Date());
                 cell.setCellValue(date1);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(36);
+                cell = rowx.createCell(37);
                 cell.setCellValue(editFloat(exportVView.getSettlementWeight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(37);
+                cell = rowx.createCell(38);
                 cell.setCellValue(editFloat(exportVView.getSettlementPrice()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(38);
+                cell = rowx.createCell(39);
                 cell.setCellValue(editFloat(exportVView.getCarFreight()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(39);
+                cell = rowx.createCell(40);
                 cell.setCellValue(editFloat(exportVView.getTrainFreight()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(40);
-                cell.setCellValue(editFloat(exportVView.getShipFreight()));
-                cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(41);
                 cell.setCellValue(editFloat(exportVView.getShipFreight()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(42);
+                cell.setCellValue(editFloat(exportVView.getShipFreight()));
+                cell.setCellStyle(styleDetail);
+                cell = rowx.createCell(43);
                 cell.setCellValue(editDouble(exportVView.getAmountIngReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(43);
+                cell = rowx.createCell(44);
                 cell.setCellValue(editDouble(exportVView.getAmountEdReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(44);
+                cell = rowx.createCell(45);
                 cell.setCellValue(editDouble(exportVView.getAmountNotReceivable()));
                 cell.setCellStyle(contextstyle);
-                cell = rowx.createCell(45);
+                cell = rowx.createCell(46);
                 String date2 = addDateOneDay(exportVView.getCollectionDate() != null ? exportVView.getCollectionDate() : new Date());
                 cell.setCellValue(date2);
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(46);
+                cell = rowx.createCell(47);
                 cell.setCellValue(editFloat(exportVView.getMoney()));
                 cell.setCellStyle(styleDetail);
-                cell = rowx.createCell(47);
+                cell = rowx.createCell(48);
                 cell.setCellValue(editString(exportVView.getStatus()));
                 cell.setCellStyle(styleDetail);
 

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -332,6 +332,7 @@
 --         w.warehouse_name as contractNo,
         case when m.contract_type = '1' then m.contract_no else '' end as contractNo,
         '' as customerName,
+        '' as remark,
         w.in_out_task_no as inOutTaskNo,
         w.goods_name as goodsName,
         case when w.goods_name = '玉米(潮粮)' then '潮粮' else '干粮' end as type,
@@ -404,6 +405,7 @@
         cm.cost as costPrice,
         case when m.contract_type = '1' then m.contract_no else '' end as contractNo,
         m.buyer as customerName,
+        wm.customer as remark,
         w.in_out_task_no as inOutTaskNo,
         g.goods_name as goodsName,
         case when g.goods_name = '玉米(潮粮)' then '潮粮' else '干粮' end as type,
@@ -447,6 +449,7 @@
         t.receive_warehouse as receiveWarehouse
         FROM stock_sale_receipt_report s
         left join warehouse_in_out_info w on w.id = s.warehouse_record_id and w.delete_flag = 0
+        left join weighing_management wm on wm.warehouse_in_out_id = w.id and wm.delete_flag = 0
         left join tran_process_info p on p.id = s.process_id and p.delete_flag = 0
         left join tran_task_info t on t.id = p.info_id and t.delete_flag = 0
         left join tran_car_info i on i.process_id = p.id and i.delete_flag = 0 and i.tran_car_no = s.tran_car_no and